Commit 8fe6e670 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: use new PM macros 

This is based on series [0] that extended the PM core. Now the compiler
can see the PM callbacks also on systems not defining CONFIG_PM.
The optimizer will remove the functions then in this case.

[0] https://lore.kernel.org/netdev/20211207002102.26414-1-paul@crapouillou.net/



Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 934d0f03

drivers/net/ethernet/realtek/r8169_main.c

+6 −12
Original line number Diff line number Diff line
@@ -4843,8 +4843,6 @@ static void rtl8169_net_suspend(struct rtl8169_private *tp) 
		rtl8169_down(tp);

}



#ifdef CONFIG_PM



static int rtl8169_runtime_resume(struct device *dev)

{

	struct rtl8169_private *tp = dev_get_drvdata(dev);
@@ -4860,7 +4858,7 @@ static int rtl8169_runtime_resume(struct device *dev) 
	return 0;

}



static int __maybe_unused rtl8169_suspend(struct device *device)

static int rtl8169_suspend(struct device *device)

{

	struct rtl8169_private *tp = dev_get_drvdata(device);
@@ -4873,7 +4871,7 @@ static int __maybe_unused rtl8169_suspend(struct device *device) 
	return 0;

}



static int __maybe_unused rtl8169_resume(struct device *device)

static int rtl8169_resume(struct device *device)

{

	struct rtl8169_private *tp = dev_get_drvdata(device);
@@ -4915,13 +4913,11 @@ static int rtl8169_runtime_idle(struct device *device) 
}



static const struct dev_pm_ops rtl8169_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(rtl8169_suspend, rtl8169_resume)

	SET_RUNTIME_PM_OPS(rtl8169_runtime_suspend, rtl8169_runtime_resume,

	SYSTEM_SLEEP_PM_OPS(rtl8169_suspend, rtl8169_resume)

	RUNTIME_PM_OPS(rtl8169_runtime_suspend, rtl8169_runtime_resume,

		       rtl8169_runtime_idle)

};



#endif /* CONFIG_PM */



static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp)

{

	/* WoL fails with 8168b when the receiver is disabled. */
@@ -5460,9 +5456,7 @@ static struct pci_driver rtl8169_pci_driver = { 
	.probe		= rtl_init_one,

	.remove		= rtl_remove_one,

	.shutdown	= rtl_shutdown,

#ifdef CONFIG_PM

	.driver.pm	= &rtl8169_pm_ops,

#endif

	.driver.pm	= pm_ptr(&rtl8169_pm_ops),

};



module_pci_driver(rtl8169_pci_driver);