r8169: improve handling power management ops (67ee63ef) · Commits · 戴 / test

drivers/net/ethernet/realtek/r8169_main.c

+9 −19

Original line number	Diff line number	Diff line
		@@ -4821,7 +4821,7 @@ static void rtl8169_net_suspend(struct rtl8169_private *tp)

		#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);

		@@ -4847,7 +4847,7 @@ static void __rtl8169_resume(struct rtl8169_private *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);

		@@ -4909,24 +4909,12 @@ static int rtl8169_runtime_idle(struct device *device)
		}

		static const struct dev_pm_ops rtl8169_pm_ops = {
		.suspend = rtl8169_suspend,
		.resume = rtl8169_resume,
		.freeze = rtl8169_suspend,
		.thaw = rtl8169_resume,
		.poweroff = rtl8169_suspend,
		.restore = rtl8169_resume,
		.runtime_suspend = rtl8169_runtime_suspend,
		.runtime_resume = rtl8169_runtime_resume,
		.runtime_idle = rtl8169_runtime_idle,
		SET_SYSTEM_SLEEP_PM_OPS(rtl8169_suspend, rtl8169_resume)
		SET_RUNTIME_PM_OPS(rtl8169_runtime_suspend, rtl8169_runtime_resume,
		rtl8169_runtime_idle)
		};

		#define RTL8169_PM_OPS (&rtl8169_pm_ops)

		#else /* !CONFIG_PM */

		#define RTL8169_PM_OPS NULL

		#endif /* !CONFIG_PM */
		#endif /* CONFIG_PM */

		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,
		.remove = rtl_remove_one,
		.shutdown = rtl_shutdown,
		.driver.pm = RTL8169_PM_OPS,
		#ifdef CONFIG_PM
		.driver.pm = &rtl8169_pm_ops,
		#endif
		};

		module_pci_driver(rtl8169_pci_driver);

Admin message