public inbox for linux-block@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Hector Martin <marcan@marcan.st>, Sven Peter <sven@svenpeter.dev>,
	Keith Busch <kbusch@kernel.org>, Sagi Grimberg <sagi@grimberg.me>,
	"Martin K. Petersen" <martin.petersen@oracle.com>,
	linux-block@vger.kernel.org, linux-nvme@lists.infradead.org,
	linux-scsi@vger.kernel.org
Subject: [PATCH 4/4] nvme-apple: remove an extra queue reference
Date: Tue, 18 Oct 2022 15:57:20 +0200	[thread overview]
Message-ID: <20221018135720.670094-5-hch@lst.de> (raw)
In-Reply-To: <20221018135720.670094-1-hch@lst.de>

Now that blk_mq_destroy_queue does not release the queue reference, there
is no need for a second admin queue reference to be held by the
apple_nvme structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/nvme/host/apple.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
index 42b17439dfd57..fe7f0444a8e46 100644
--- a/drivers/nvme/host/apple.c
+++ b/drivers/nvme/host/apple.c
@@ -1505,15 +1505,6 @@ static int apple_nvme_probe(struct platform_device *pdev)
 		goto put_dev;
 	}
 
-	if (!blk_get_queue(anv->ctrl.admin_q)) {
-		nvme_start_admin_queue(&anv->ctrl);
-		blk_mq_destroy_queue(anv->ctrl.admin_q);
-		blk_put_queue(anv->ctrl.admin_q);
-		anv->ctrl.admin_q = NULL;
-		ret = -ENODEV;
-		goto put_dev;
-	}
-
 	nvme_reset_ctrl(&anv->ctrl);
 	async_schedule(apple_nvme_async_probe, anv);
 
-- 
2.30.2


  parent reply	other threads:[~2022-10-18 13:58 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-18 13:57 don't drop the queue reference in blk_mq_destroy_queue Christoph Hellwig
2022-10-18 13:57 ` [PATCH 1/4] blk-mq: move the call to blk_put_queue out of blk_mq_destroy_queue Christoph Hellwig
2022-10-18 20:44   ` Chaitanya Kulkarni
2022-10-19  8:19   ` Sagi Grimberg
2022-10-25 14:23   ` Jens Axboe
2022-10-25 14:25     ` Jens Axboe
2022-10-18 13:57 ` [PATCH 2/4] scsi: remove an extra queue reference Christoph Hellwig
2022-10-18 20:44   ` Chaitanya Kulkarni
2022-10-19  1:16   ` Ming Lei
2022-10-19  1:23     ` Ming Lei
2022-10-19  8:19   ` Sagi Grimberg
2022-10-18 13:57 ` [PATCH 3/4] nvme-pci: " Christoph Hellwig
2022-10-18 20:44   ` Chaitanya Kulkarni
2022-10-19  8:19   ` Sagi Grimberg
2022-10-18 13:57 ` Christoph Hellwig [this message]
2022-10-18 17:51   ` [PATCH 4/4] nvme-apple: " Sven Peter
2022-10-18 20:45   ` Chaitanya Kulkarni
2022-10-19  8:19   ` Sagi Grimberg
2022-10-18 15:16 ` don't drop the queue reference in blk_mq_destroy_queue Keith Busch
2022-10-25 14:26 ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221018135720.670094-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=marcan@marcan.st \
    --cc=martin.petersen@oracle.com \
    --cc=sagi@grimberg.me \
    --cc=sven@svenpeter.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox