Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

r8169: use pci_prepare_to_sleep in rtl_shutdown

Use pci_prepare_to_sleep() like PCI core does in pci_pm_suspend_noirq.
This aligns setting a low-power mode during shutdown with the handling
of the transition to system suspend. Also the transition to runtime
suspend uses pci_target_state() instead of setting D3hot unconditionally.

Note: pci_prepare_to_sleep() uses device_may_wakeup() to check whether
device may generate wakeup events. So we don't lose anything by
not passing tp->saved_wolopts any longer.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/f573fdbd-ba6d-41c1-b68f-311d3c88db2c@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Heiner Kallweit and committed by
Jakub Kicinski
b7ed5d5a 67b083f1

+2 -4
+2 -4
drivers/net/ethernet/realtek/r8169_main.c
··· 5039 5039 /* Restore original MAC address */ 5040 5040 rtl_rar_set(tp, tp->dev->perm_addr); 5041 5041 5042 - if (system_state == SYSTEM_POWER_OFF && !tp->dash_enabled) { 5043 - pci_wake_from_d3(pdev, tp->saved_wolopts); 5044 - pci_set_power_state(pdev, PCI_D3hot); 5045 - } 5042 + if (system_state == SYSTEM_POWER_OFF && !tp->dash_enabled) 5043 + pci_prepare_to_sleep(pdev); 5046 5044 } 5047 5045 5048 5046 static void rtl_remove_one(struct pci_dev *pdev)