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

Commit b5b05048 authored by Sagi Grimberg's avatar Sagi Grimberg
Browse files

nvme: don't pass cap to nvme_disable_ctrl 



All seem to call it with ctrl->cap so no need to pass it
at all.

Reviewed-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent c0f2f45b

drivers/nvme/host/core.c

+2 −2
Original line number Diff line number Diff line
@@ -1950,7 +1950,7 @@ static int nvme_wait_ready(struct nvme_ctrl *ctrl, u64 cap, bool enabled) 
 * bits', but doing so may cause the device to complete commands to the

 * admin queue ... and we don't know what memory that might be pointing at!

 */

int nvme_disable_ctrl(struct nvme_ctrl *ctrl, u64 cap)

int nvme_disable_ctrl(struct nvme_ctrl *ctrl)

{

	int ret;
@@ -1964,7 +1964,7 @@ int nvme_disable_ctrl(struct nvme_ctrl *ctrl, u64 cap) 
	if (ctrl->quirks & NVME_QUIRK_DELAY_BEFORE_CHK_RDY)

		msleep(NVME_QUIRK_DELAY_AMOUNT);



	return nvme_wait_ready(ctrl, cap, false);

	return nvme_wait_ready(ctrl, ctrl->cap, false);

}

EXPORT_SYMBOL_GPL(nvme_disable_ctrl);

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ void nvme_complete_rq(struct request *req); 
bool nvme_cancel_request(struct request *req, void *data, bool reserved);

bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl,

		enum nvme_ctrl_state new_state);

int nvme_disable_ctrl(struct nvme_ctrl *ctrl, u64 cap);

int nvme_disable_ctrl(struct nvme_ctrl *ctrl);

int nvme_enable_ctrl(struct nvme_ctrl *ctrl);

int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl);

int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,

drivers/nvme/host/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1403,7 +1403,7 @@ static void nvme_disable_admin_queue(struct nvme_dev *dev, bool shutdown) 
	if (shutdown)

		nvme_shutdown_ctrl(&dev->ctrl);

	else

		nvme_disable_ctrl(&dev->ctrl, dev->ctrl.cap);

		nvme_disable_ctrl(&dev->ctrl);



	nvme_poll_irqdisable(nvmeq, -1);

}
@@ -1679,7 +1679,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev) 
	    (readl(dev->bar + NVME_REG_CSTS) & NVME_CSTS_NSSRO))

		writel(NVME_CSTS_NSSRO, dev->bar + NVME_REG_CSTS);



	result = nvme_disable_ctrl(&dev->ctrl, dev->ctrl.cap);

	result = nvme_disable_ctrl(&dev->ctrl);

	if (result < 0)

		return result;

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -1859,7 +1859,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown) 
	if (shutdown)

		nvme_shutdown_ctrl(&ctrl->ctrl);

	else

		nvme_disable_ctrl(&ctrl->ctrl, ctrl->ctrl.cap);

		nvme_disable_ctrl(&ctrl->ctrl);

	nvme_rdma_teardown_admin_queue(ctrl, shutdown);

}

drivers/nvme/host/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -1886,7 +1886,7 @@ static void nvme_tcp_teardown_ctrl(struct nvme_ctrl *ctrl, bool shutdown) 
	if (shutdown)

		nvme_shutdown_ctrl(ctrl);

	else

		nvme_disable_ctrl(ctrl, ctrl->cap);

		nvme_disable_ctrl(ctrl);

	nvme_tcp_teardown_admin_queue(ctrl, shutdown);

}