From: Matias Bjørling <m@bjorling.me>
Date: Tue, 18 Aug 2015 16:13:41 +0000 (-0600)
Subject: NVMe: removed unused nn var from nvme_dev_add
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b2b1ec9b55ed0840956db15f823c4a73383c08be;p=linux-beck.git

NVMe: removed unused nn var from nvme_dev_add

The logic in nvme_dev_add to enumerate namespaces was moved to
nvme_dev_scan. When moved, the nn variable is no longer used. This patch
removes it.

Fixes: a5768aai ("NVMe: Automatic namespace rescan")
Signed-off-by: Matias Bjørling <m@bjorling.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 2e16000693bf..85cd33bf9607 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2447,7 +2447,6 @@ static int nvme_dev_add(struct nvme_dev *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev->dev);
 	int res;
-	unsigned nn;
 	struct nvme_id_ctrl *ctrl;
 	int shift = NVME_CAP_MPSMIN(readq(&dev->bar->cap)) + 12;
 
@@ -2457,7 +2456,6 @@ static int nvme_dev_add(struct nvme_dev *dev)
 		return -EIO;
 	}
 
-	nn = le32_to_cpup(&ctrl->nn);
 	dev->oncs = le16_to_cpup(&ctrl->oncs);
 	dev->abort_limit = ctrl->acl + 1;
 	dev->vwc = ctrl->vwc;