summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2016-04-12 16:11:11 -0600
committerJens Axboe <axboe@fb.com>2016-04-12 16:11:11 -0600
commit7e19793096994d43d213f440f4bbea926828a727 (patch)
tree05641b4f0591f17962e12f814e6698439cc0e218
parent2245f6de6c68b225986229a2de78c240536f7f38 (diff)
NVMe: silence warning about unused 'dev'
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>
-rw-r--r--drivers/nvme/host/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index bd0d39482e83..36b6cdf22de3 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -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))