nvme-apple: remove an extra queue reference

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>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/20221018135720.670094-5-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
index 7b8068a..a89b06a 100644 (file)
--- a/drivers/nvme/host/apple.c
+++ b/drivers/nvme/host/apple.c
@@ -1507,15 +1507,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);