[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211201025419.2797624-3-helgaas@kernel.org>
Date: Tue, 30 Nov 2021 20:54:18 -0600
From: Bjorn Helgaas <helgaas@...nel.org>
To: David Airlie <airlied@...ux.ie>
Cc: Vaibhav Gupta <vaibhav.varodek@...il.com>,
Vaibhav Gupta <vaibhavgupta40@...il.com>,
"Rafael J . Wysocki" <rafael@...nel.org>,
linux-kernel@...r.kernel.org, linux-pci@...r.kernel.org,
Bjorn Helgaas <bhelgaas@...gle.com>
Subject: [PATCH v2 2/3] sis-agp: convert to generic power management
From: Vaibhav Gupta <vaibhavgupta40@...il.com>
Convert sis-agp from legacy PCI power management to the generic power
management framework.
Previously, sis-agp used legacy PCI power management. agp_sis_suspend()
looked like this:
agp_sis_suspend
pci_save_state(pdev)
pci_set_power_state(pdev, pci_choose_state(pdev, state))
With generic power management, these are both done by the PCI core in
pci_pm_runtime_suspend(), so drop agp_sis_suspend() completely.
agp_sis_resume() looked like this:
agp_sis_resume
pci_set_power_state(pdev, PCI_D0)
pci_restore_state(pdev)
sis_driver.configure()
With generic power management, the PCI parts are done by
pci_pm_runtime_resume(), so drop those from agp_sis_resume().
[bhelgaas: commit log]
Signed-off-by: Vaibhav Gupta <vaibhavgupta40@...il.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@...gle.com>
---
drivers/char/agp/sis-agp.c | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c
index 14909fc5d767..f8a02f4bef1b 100644
--- a/drivers/char/agp/sis-agp.c
+++ b/drivers/char/agp/sis-agp.c
@@ -217,26 +217,14 @@ static void agp_sis_remove(struct pci_dev *pdev)
agp_put_bridge(bridge);
}
-#ifdef CONFIG_PM
+#define agp_sis_suspend NULL
-static int agp_sis_suspend(struct pci_dev *pdev, pm_message_t state)
+static int __maybe_unused agp_sis_resume(
+ __attribute__((unused)) struct device *dev)
{
- pci_save_state(pdev);
- pci_set_power_state(pdev, pci_choose_state(pdev, state));
-
- return 0;
-}
-
-static int agp_sis_resume(struct pci_dev *pdev)
-{
- pci_set_power_state(pdev, PCI_D0);
- pci_restore_state(pdev);
-
return sis_driver.configure();
}
-#endif /* CONFIG_PM */
-
static const struct pci_device_id agp_sis_pci_table[] = {
{
.class = (PCI_CLASS_BRIDGE_HOST << 8),
@@ -419,15 +407,14 @@ static const struct pci_device_id agp_sis_pci_table[] = {
MODULE_DEVICE_TABLE(pci, agp_sis_pci_table);
+static SIMPLE_DEV_PM_OPS(agp_sis_pm_ops, agp_sis_suspend, agp_sis_resume);
+
static struct pci_driver agp_sis_pci_driver = {
.name = "agpgart-sis",
.id_table = agp_sis_pci_table,
.probe = agp_sis_probe,
.remove = agp_sis_remove,
-#ifdef CONFIG_PM
- .suspend = agp_sis_suspend,
- .resume = agp_sis_resume,
-#endif
+ .driver.pm = &agp_sis_pm_ops,
};
static int __init agp_sis_init(void)
--
2.25.1
Powered by blists - more mailing lists