From: hslester96@gmail.com (Chuhong Yuan)
Subject: [PATCH] nvme-pci: Use dev_get_drvdata where possible
Date: Wed, 24 Jul 2019 20:22:35 +0800 [thread overview]
Message-ID: <20190724122235.21639-1-hslester96@gmail.com> (raw)
Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.
Signed-off-by: Chuhong Yuan <hslester96 at gmail.com>
---
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
next reply other threads:[~2019-07-24 12:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 12:22 Chuhong Yuan [this message]
2019-07-24 18:15 ` [PATCH] nvme-pci: Use dev_get_drvdata where possible Sagi Grimberg
2019-07-25 13:14 ` Minwoo Im
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190724122235.21639-1-hslester96@gmail.com \
--to=hslester96@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox