r8169: improve handling power management ops
Simplify handling the power management callbacks. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
8ac8e8c64b
Коммит
67ee63ef2b
|
@ -4821,7 +4821,7 @@ static void rtl8169_net_suspend(struct rtl8169_private *tp)
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
|
|
||||||
static int rtl8169_suspend(struct device *device)
|
static int __maybe_unused rtl8169_suspend(struct device *device)
|
||||||
{
|
{
|
||||||
struct rtl8169_private *tp = dev_get_drvdata(device);
|
struct rtl8169_private *tp = dev_get_drvdata(device);
|
||||||
|
|
||||||
|
@ -4847,7 +4847,7 @@ static void __rtl8169_resume(struct rtl8169_private *tp)
|
||||||
rtl_unlock_work(tp);
|
rtl_unlock_work(tp);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rtl8169_resume(struct device *device)
|
static int __maybe_unused rtl8169_resume(struct device *device)
|
||||||
{
|
{
|
||||||
struct rtl8169_private *tp = dev_get_drvdata(device);
|
struct rtl8169_private *tp = dev_get_drvdata(device);
|
||||||
|
|
||||||
|
@ -4909,24 +4909,12 @@ static int rtl8169_runtime_idle(struct device *device)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct dev_pm_ops rtl8169_pm_ops = {
|
static const struct dev_pm_ops rtl8169_pm_ops = {
|
||||||
.suspend = rtl8169_suspend,
|
SET_SYSTEM_SLEEP_PM_OPS(rtl8169_suspend, rtl8169_resume)
|
||||||
.resume = rtl8169_resume,
|
SET_RUNTIME_PM_OPS(rtl8169_runtime_suspend, rtl8169_runtime_resume,
|
||||||
.freeze = rtl8169_suspend,
|
rtl8169_runtime_idle)
|
||||||
.thaw = rtl8169_resume,
|
|
||||||
.poweroff = rtl8169_suspend,
|
|
||||||
.restore = rtl8169_resume,
|
|
||||||
.runtime_suspend = rtl8169_runtime_suspend,
|
|
||||||
.runtime_resume = rtl8169_runtime_resume,
|
|
||||||
.runtime_idle = rtl8169_runtime_idle,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define RTL8169_PM_OPS (&rtl8169_pm_ops)
|
#endif /* CONFIG_PM */
|
||||||
|
|
||||||
#else /* !CONFIG_PM */
|
|
||||||
|
|
||||||
#define RTL8169_PM_OPS NULL
|
|
||||||
|
|
||||||
#endif /* !CONFIG_PM */
|
|
||||||
|
|
||||||
static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp)
|
static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp)
|
||||||
{
|
{
|
||||||
|
@ -5458,7 +5446,9 @@ static struct pci_driver rtl8169_pci_driver = {
|
||||||
.probe = rtl_init_one,
|
.probe = rtl_init_one,
|
||||||
.remove = rtl_remove_one,
|
.remove = rtl_remove_one,
|
||||||
.shutdown = rtl_shutdown,
|
.shutdown = rtl_shutdown,
|
||||||
.driver.pm = RTL8169_PM_OPS,
|
#ifdef CONFIG_PM
|
||||||
|
.driver.pm = &rtl8169_pm_ops,
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
module_pci_driver(rtl8169_pci_driver);
|
module_pci_driver(rtl8169_pci_driver);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче