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

Commit 77b50d9e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: merge nvme_dev_reset into nvme_reset_failed_dev 



And give the resulting function a more descriptive name.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 201cf1ec

drivers/block/nvme-core.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -84,7 +84,6 @@ static wait_queue_head_t nvme_kthread_wait; 




static struct class *nvme_class;

static struct class *nvme_class;





static void nvme_reset_failed_dev(struct work_struct *ws);

static int nvme_reset(struct nvme_dev *dev);

static int nvme_reset(struct nvme_dev *dev);

static int nvme_process_cq(struct nvme_queue *nvmeq);

static int nvme_process_cq(struct nvme_queue *nvmeq);
@@ -3053,8 +3052,9 @@ static void nvme_dead_ctrl(struct nvme_dev *dev) 
	}

	}

}

}





static void nvme_dev_reset(struct nvme_dev *dev)

static void nvme_reset_work(struct work_struct *ws)

{

{

	struct nvme_dev *dev = container_of(ws, struct nvme_dev, reset_work);

	bool in_probe = work_busy(&dev->probe_work);

	bool in_probe = work_busy(&dev->probe_work);





	nvme_dev_shutdown(dev);

	nvme_dev_shutdown(dev);
@@ -3074,12 +3074,6 @@ static void nvme_dev_reset(struct nvme_dev *dev) 
	schedule_work(&dev->probe_work);

	schedule_work(&dev->probe_work);

}

}





static void nvme_reset_failed_dev(struct work_struct *ws)

{

	struct nvme_dev *dev = container_of(ws, struct nvme_dev, reset_work);

	nvme_dev_reset(dev);

}



static int nvme_reset(struct nvme_dev *dev)

static int nvme_reset(struct nvme_dev *dev)

{

{

	int ret = -EBUSY;

	int ret = -EBUSY;
@@ -3142,7 +3136,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto free;

		goto free;





	INIT_LIST_HEAD(&dev->namespaces);

	INIT_LIST_HEAD(&dev->namespaces);

	INIT_WORK(&dev->reset_work, nvme_reset_failed_dev);

	INIT_WORK(&dev->reset_work, nvme_reset_work);

	dev->dev = get_device(&pdev->dev);

	dev->dev = get_device(&pdev->dev);

	pci_set_drvdata(pdev, dev);

	pci_set_drvdata(pdev, dev);

	result = nvme_set_instance(dev);

	result = nvme_set_instance(dev);