Skip to content

Commit 23a98b6

Browse files
VARoDeKgregkh
authored andcommitted
serial: pch_uart: use generic power management
Drivers using legacy PM have to manage PCI states and device's PM states themselves. They also need to take care of configuration registers. With improved and powerful support of generic PM, PCI Core takes care of above mentioned, device-independent, jobs. This driver makes use of PCI helper functions like pci_save/restore_state(), pci_enable_device() and pci_set_power_state() to do required operations. In generic mode, they are no longer needed. Change function parameter in both .suspend() and .resume() to "struct device*" type. Use dev_get_drvdata() to get drv data. Compile-tested only. Signed-off-by: Vaibhav Gupta <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent aaad294 commit 23a98b6

File tree

1 file changed

+10
-24
lines changed

1 file changed

+10
-24
lines changed

drivers/tty/serial/pch_uart.c

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1857,41 +1857,24 @@ static void pch_uart_pci_remove(struct pci_dev *pdev)
18571857
kfree(priv);
18581858
return;
18591859
}
1860-
#ifdef CONFIG_PM
1861-
static int pch_uart_pci_suspend(struct pci_dev *pdev, pm_message_t state)
1860+
1861+
static int __maybe_unused pch_uart_pci_suspend(struct device *dev)
18621862
{
1863-
struct eg20t_port *priv = pci_get_drvdata(pdev);
1863+
struct eg20t_port *priv = dev_get_drvdata(dev);
18641864

18651865
uart_suspend_port(&pch_uart_driver, &priv->port);
18661866

1867-
pci_save_state(pdev);
1868-
pci_set_power_state(pdev, pci_choose_state(pdev, state));
18691867
return 0;
18701868
}
18711869

1872-
static int pch_uart_pci_resume(struct pci_dev *pdev)
1870+
static int __maybe_unused pch_uart_pci_resume(struct device *dev)
18731871
{
1874-
struct eg20t_port *priv = pci_get_drvdata(pdev);
1875-
int ret;
1876-
1877-
pci_set_power_state(pdev, PCI_D0);
1878-
pci_restore_state(pdev);
1879-
1880-
ret = pci_enable_device(pdev);
1881-
if (ret) {
1882-
dev_err(&pdev->dev,
1883-
"%s-pci_enable_device failed(ret=%d) ", __func__, ret);
1884-
return ret;
1885-
}
1872+
struct eg20t_port *priv = dev_get_drvdata(dev);
18861873

18871874
uart_resume_port(&pch_uart_driver, &priv->port);
18881875

18891876
return 0;
18901877
}
1891-
#else
1892-
#define pch_uart_pci_suspend NULL
1893-
#define pch_uart_pci_resume NULL
1894-
#endif
18951878

18961879
static const struct pci_device_id pch_uart_pci_id[] = {
18971880
{PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8811),
@@ -1945,13 +1928,16 @@ static int pch_uart_pci_probe(struct pci_dev *pdev,
19451928
return ret;
19461929
}
19471930

1931+
static SIMPLE_DEV_PM_OPS(pch_uart_pci_pm_ops,
1932+
pch_uart_pci_suspend,
1933+
pch_uart_pci_resume);
1934+
19481935
static struct pci_driver pch_uart_pci_driver = {
19491936
.name = "pch_uart",
19501937
.id_table = pch_uart_pci_id,
19511938
.probe = pch_uart_pci_probe,
19521939
.remove = pch_uart_pci_remove,
1953-
.suspend = pch_uart_pci_suspend,
1954-
.resume = pch_uart_pci_resume,
1940+
.driver.pm = &pch_uart_pci_pm_ops,
19551941
};
19561942

19571943
static int __init pch_uart_module_init(void)

0 commit comments

Comments
 (0)