Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2b1ec9b authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

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: default avatarMatias Bjørling <m@bjorling.me>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e824410f

drivers/block/nvme-core.c

+0 −2
Original line number Diff line number Diff line
@@ -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;