Commit c9ae520a authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Paolo Abeni
Browse files

r8169: remove rtl_wol_shutdown_quirk() 



Since f658b909 ("r8169: fix DMA being used after buffer free if WoL is
enabled") it has been redundant to disable PCI bus mastering in
rtl_wol_shutdown_quirk(). And since 12006848 ("r8169: fix failing WoL")
CmdRxEnb is still enabled when we get here. So we can remove the function.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/2391ada0-eac5-ac43-f061-a7a44b0e7f33@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 41e3b072

drivers/net/ethernet/realtek/r8169_main.c

+0 −19
Original line number Diff line number Diff line
@@ -4836,22 +4836,6 @@ static const struct dev_pm_ops rtl8169_pm_ops = { 
		       rtl8169_runtime_idle)

};



static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp)

{

	/* WoL fails with 8168b when the receiver is disabled. */

	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_11:

	case RTL_GIGA_MAC_VER_17:

		pci_clear_master(tp->pci_dev);



		RTL_W8(tp, ChipCmd, CmdRxEnb);

		rtl_pci_commit(tp);

		break;

	default:

		break;

	}

}



static void rtl_shutdown(struct pci_dev *pdev)

{

	struct rtl8169_private *tp = pci_get_drvdata(pdev);
@@ -4865,9 +4849,6 @@ static void rtl_shutdown(struct pci_dev *pdev) 


	if (system_state == SYSTEM_POWER_OFF &&

	    tp->dash_type == RTL_DASH_NONE) {

		if (tp->saved_wolopts)

			rtl_wol_shutdown_quirk(tp);



		pci_wake_from_d3(pdev, tp->saved_wolopts);

		pci_set_power_state(pdev, PCI_D3hot);

	}