diff options
| author |   Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> | 2019-06-08 13:16:32 -0700 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2019-06-21 11:08:39 +0200 |
| commit | 7c1ce408eb320b3d4051570d167852ffbd7778ce (patch) | |
| tree | f700098c780598772cf0a894466f63f1123cf756 /drivers/nvme | |
| parent | nvme-pci: properly report state change failure in nvme_reset_work (diff) | |
| download | linux-dev-7c1ce408eb320b3d4051570d167852ffbd7778ce.tar.xz linux-dev-7c1ce408eb320b3d4051570d167852ffbd7778ce.zip | |
nvme-pci: clean up nvme_remove_dead_ctrl a bit
Remove the status parameter o nvme_remove_dead_ctrl(), which is only
used for printing it.
We move the print message to the same function where actual error is
occurring.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index d308ae7e2e11..189352081994 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2451,10 +2451,8 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl) kfree(dev); } -static void nvme_remove_dead_ctrl(struct nvme_dev *dev, int status) +static void nvme_remove_dead_ctrl(struct nvme_dev *dev) { - dev_warn(dev->ctrl.device, "Removing after probe failure status: %d\n", status); - nvme_get_ctrl(&dev->ctrl); nvme_dev_disable(dev, false); nvme_kill_queues(&dev->ctrl); @@ -2588,7 +2586,10 @@ static void nvme_reset_work(struct work_struct *work) out_unlock: mutex_unlock(&dev->shutdown_lock); out: - nvme_remove_dead_ctrl(dev, result); + if (result) + dev_warn(dev->ctrl.device, + "Removing after probe failure status: %d\n", result); + nvme_remove_dead_ctrl(dev); } static void nvme_remove_dead_ctrl_work(struct work_struct *work) |