NVMe: silence warning about unused 'dev'
authorJens Axboe <axboe@fb.com>
Tue, 12 Apr 2016 22:11:11 +0000 (16:11 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 12 Apr 2016 22:11:11 +0000 (16:11 -0600)
Depending on options, we might not be using dev in nvme_cancel_io():

drivers/nvme/host/pci.c: In function ‘nvme_cancel_io’:
drivers/nvme/host/pci.c:970:19: warning: unused variable ‘dev’ [-Wunused-variable]
  struct nvme_dev *dev = data;
                   ^

So get rid of it, and just cast for the dev_dbg_ratelimited() call.

Fixes: 82b4552b91c4 ("nvme: Use blk-mq helper for IO termination")
Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/nvme/host/pci.c

index bd0d39482e8395bc187beeaa8cd6cd5bf1e2d5cb..36b6cdf22de3ef822c53eb2b8e3f729b3c5f6bbe 100644 (file)
@@ -967,13 +967,13 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
 
 static void nvme_cancel_io(struct request *req, void *data, bool reserved)
 {
-       struct nvme_dev *dev = data;
        int status;
 
        if (!blk_mq_request_started(req))
                return;
 
-       dev_dbg_ratelimited(dev->ctrl.device, "Cancelling I/O %d", req->tag);
+       dev_dbg_ratelimited(((struct nvme_dev *) data)->ctrl.device,
+                               "Cancelling I/O %d", req->tag);
 
        status = NVME_SC_ABORT_REQ;
        if (blk_queue_dying(req->q))