From: Vaibhav Gupta <vaibhavgupta40@gmail.com>
To: Bjorn Helgaas <helgaas@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
bjorn@helgaas.com, Vaibhav Gupta <vaibhav.varodek@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>,
linux-kernel@vger.kernel.org,
linux-kernel-mentees@lists.linuxfoundation.org,
skhan@linuxfoundation.org, linux-ide@vger.kernel.org
Subject: [PATCH v1 4/4] ide: delkin_cb: use generic power management
Date: Wed, 24 Jun 2020 22:58:57 +0530 [thread overview]
Message-ID: <20200624172857.60915-5-vaibhavgupta40@gmail.com> (raw)
In-Reply-To: <20200624172857.60915-1-vaibhavgupta40@gmail.com>
With the support of generic PM callbacks, drivers no longer need to use
legacy .suspend() and .resume() in which they had to maintain PCI states
changes and device's power state themselves. All required operations are
done by PCI core.
After converting it into generic model, suspend() became an empty function.
Hence, it is defined as NULL.
Compile-tested only.
Signed-off-by: Vaibhav Gupta <vaibhavgupta40@gmail.com>
---
drivers/ide/delkin_cb.c | 35 +++++++----------------------------
1 file changed, 7 insertions(+), 28 deletions(-)
diff --git a/drivers/ide/delkin_cb.c b/drivers/ide/delkin_cb.c
index 300daabaa575..8a3dc4dd6e66 100644
--- a/drivers/ide/delkin_cb.c
+++ b/drivers/ide/delkin_cb.c
@@ -123,39 +123,17 @@ delkin_cb_remove (struct pci_dev *dev)
pci_disable_device(dev);
}
-#ifdef CONFIG_PM
-static int delkin_cb_suspend(struct pci_dev *dev, pm_message_t state)
-{
- pci_save_state(dev);
- pci_disable_device(dev);
- pci_set_power_state(dev, pci_choose_state(dev, state));
-
- return 0;
-}
+#define delkin_cb_suspend NULL
-static int delkin_cb_resume(struct pci_dev *dev)
+static int __maybe_unused delkin_cb_resume(struct device *dev_d)
{
- struct ide_host *host = pci_get_drvdata(dev);
- int rc;
-
- pci_set_power_state(dev, PCI_D0);
-
- rc = pci_enable_device(dev);
- if (rc)
- return rc;
-
- pci_restore_state(dev);
- pci_set_master(dev);
+ struct ide_host *host = dev_get_drvdata(dev_d);
if (host->init_chipset)
- host->init_chipset(dev);
+ host->init_chipset(to_pci_dev(dev_d));
return 0;
}
-#else
-#define delkin_cb_suspend NULL
-#define delkin_cb_resume NULL
-#endif
static struct pci_device_id delkin_cb_pci_tbl[] = {
{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
@@ -164,13 +142,14 @@ static struct pci_device_id delkin_cb_pci_tbl[] = {
};
MODULE_DEVICE_TABLE(pci, delkin_cb_pci_tbl);
+static SIMPLE_DEV_PM_OPS(delkin_cb_pm_ops, delkin_cb_suspend, delkin_cb_resume);
+
static struct pci_driver delkin_cb_pci_driver = {
.name = "Delkin-ASKA-Workbit Cardbus IDE",
.id_table = delkin_cb_pci_tbl,
.probe = delkin_cb_probe,
.remove = delkin_cb_remove,
- .suspend = delkin_cb_suspend,
- .resume = delkin_cb_resume,
+ .driver.pm = &delkin_cb_pm_ops,
};
module_pci_driver(delkin_cb_pci_driver);
--
2.27.0
prev parent reply other threads:[~2020-06-24 17:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 17:28 [PATCH v1 0/4] drivers: ide: use generic power management Vaibhav Gupta
2020-06-24 17:28 ` [PATCH v1 1/4] " Vaibhav Gupta
2020-06-24 22:14 ` kernel test robot
2020-06-26 15:35 ` Bjorn Helgaas
2020-06-29 13:53 ` [kbuild-all] " Xia, Hui
2020-06-24 17:28 ` [PATCH v1 2/4] ide: triflex: " Vaibhav Gupta
2020-06-24 17:28 ` [PATCH v1 3/4] ide: sc1200: " Vaibhav Gupta
2020-06-24 17:28 ` Vaibhav Gupta [this message]
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=20200624172857.60915-5-vaibhavgupta40@gmail.com \
--to=vaibhavgupta40@gmail.com \
--cc=bhelgaas@google.com \
--cc=bjorn@helgaas.com \
--cc=davem@davemloft.net \
--cc=helgaas@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=vaibhav.varodek@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