2019-07-24 13:27:27

by Chuhong Yuan

Subject: [PATCH] nvme-pci: Use dev_get_drvdata where possible

Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by: Chuhong Yuan <[email protected]>
---
drivers/nvme/host/pci.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index bb970ca82517..3c6411f4d590 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2845,7 +2845,7 @@ static int nvme_set_power_state(struct nvme_ctrl *ctrl, u32 ps)

static int nvme_resume(struct device *dev)
{
- struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
+ struct nvme_dev *ndev = dev_get_drvdata(dev);
struct nvme_ctrl *ctrl = &ndev->ctrl;

if (pm_resume_via_firmware() || !ctrl->npss ||
@@ -2914,7 +2914,7 @@ static int nvme_suspend(struct device *dev)

static int nvme_simple_suspend(struct device *dev)
{
- struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev));
+ struct nvme_dev *ndev = dev_get_drvdata(dev);

nvme_dev_disable(ndev, true);
return 0;
@@ -2922,8 +2922,7 @@ static int nvme_simple_suspend(struct device *dev)

static int nvme_simple_resume(struct device *dev)
{
- struct pci_dev *pdev = to_pci_dev(dev);
- struct nvme_dev *ndev = pci_get_drvdata(pdev);
+ struct nvme_dev *ndev = dev_get_drvdata(dev);

nvme_reset_ctrl(&ndev->ctrl);
return 0;
--
2.20.1

2019-07-24 19:24:36

by Sagi Grimberg

Subject: Re: [PATCH] nvme-pci: Use dev_get_drvdata where possible

Reviewed-by: Sagi Grimberg <[email protected]>

2019-07-25 17:50:22

by Minwoo Im

Subject: Re: [PATCH] nvme-pci: Use dev_get_drvdata where possible

On 19-07-24 20:22:35, Chuhong Yuan wrote:
> Instead of using to_pci_dev + pci_get_drvdata,
> use dev_get_drvdata to make code simpler.
>
> Signed-off-by: Chuhong Yuan <[email protected]>

This looks good to me.

Reviewed-by: Minwoo Im <[email protected]>