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

r8169: remove some WOL-related dead code

Commit bde135a672bf "r8169: only enable PCI wakeups when WOL is active"
removed the only user of flag RTL_FEATURE_WOL. So let's remove some
now dead code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Heiner Kallweit and committed by
David S. Miller
022ddbca 5eeba397

+2 -37
+2 -37
drivers/net/ethernet/realtek/r8169.c
··· 736 736 }; 737 737 738 738 enum features { 739 - RTL_FEATURE_WOL = (1 << 0), 740 - RTL_FEATURE_MSI = (1 << 1), 741 - RTL_FEATURE_GMII = (1 << 2), 739 + RTL_FEATURE_MSI = (1 << 0), 740 + RTL_FEATURE_GMII = (1 << 1), 742 741 }; 743 742 744 743 struct rtl8169_counters { ··· 1858 1859 1859 1860 rtl_lock_work(tp); 1860 1861 1861 - if (wol->wolopts) 1862 - tp->features |= RTL_FEATURE_WOL; 1863 - else 1864 - tp->features &= ~RTL_FEATURE_WOL; 1865 1862 if (pm_runtime_active(d)) 1866 1863 __rtl8169_set_wol(tp, wol->wolopts); 1867 1864 else ··· 8516 8521 RTL_W8(Cfg9346, Cfg9346_Unlock); 8517 8522 RTL_W8(Config1, RTL_R8(Config1) | PMEnable); 8518 8523 RTL_W8(Config5, RTL_R8(Config5) & (BWF | MWF | UWF | LanWake | PMEStatus)); 8519 - switch (tp->mac_version) { 8520 - case RTL_GIGA_MAC_VER_34: 8521 - case RTL_GIGA_MAC_VER_35: 8522 - case RTL_GIGA_MAC_VER_36: 8523 - case RTL_GIGA_MAC_VER_37: 8524 - case RTL_GIGA_MAC_VER_38: 8525 - case RTL_GIGA_MAC_VER_40: 8526 - case RTL_GIGA_MAC_VER_41: 8527 - case RTL_GIGA_MAC_VER_42: 8528 - case RTL_GIGA_MAC_VER_43: 8529 - case RTL_GIGA_MAC_VER_44: 8530 - case RTL_GIGA_MAC_VER_45: 8531 - case RTL_GIGA_MAC_VER_46: 8532 - case RTL_GIGA_MAC_VER_47: 8533 - case RTL_GIGA_MAC_VER_48: 8534 - case RTL_GIGA_MAC_VER_49: 8535 - case RTL_GIGA_MAC_VER_50: 8536 - case RTL_GIGA_MAC_VER_51: 8537 - if (rtl_eri_read(tp, 0xdc, ERIAR_EXGMAC) & MagicPacket_v2) 8538 - tp->features |= RTL_FEATURE_WOL; 8539 - if ((RTL_R8(Config3) & LinkUp) != 0) 8540 - tp->features |= RTL_FEATURE_WOL; 8541 - break; 8542 - default: 8543 - if ((RTL_R8(Config3) & (LinkUp | MagicPacket)) != 0) 8544 - tp->features |= RTL_FEATURE_WOL; 8545 - break; 8546 - } 8547 - if ((RTL_R8(Config5) & (UWF | BWF | MWF)) != 0) 8548 - tp->features |= RTL_FEATURE_WOL; 8549 8524 tp->features |= rtl_try_msi(tp, cfg); 8550 8525 RTL_W8(Cfg9346, Cfg9346_Lock); 8551 8526