]> www.infradead.org Git - users/hch/block.git/commitdiff
nvme-apple: remove an extra queue reference block-queue-refs
authorChristoph Hellwig <hch@lst.de>
Thu, 29 Sep 2022 07:27:42 +0000 (09:27 +0200)
committerChristoph Hellwig <hch@lst.de>
Mon, 17 Oct 2022 05:00:30 +0000 (07:00 +0200)
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

index 42b17439dfd57183181ec223f3a623791fe19765..fe7f0444a8e46681a8d9a473acf825d4a97db93a 100644 (file)
@@ -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);