aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2019-05-25 20:43:25 +0200
committerDavid S. Miller <davem@davemloft.net>2019-05-26 22:19:39 -0700
commit29ec0482c139298d8b33aab4bde4dbdb5836fc9e (patch)
tree7f8bb31d6fc4678afe24adee4de64a9bc793c5b1
parentcxgb4: Make t4_get_tp_e2c_map static (diff)
downloadlinux-dev-29ec0482c139298d8b33aab4bde4dbdb5836fc9e.tar.xz
linux-dev-29ec0482c139298d8b33aab4bde4dbdb5836fc9e.zip
r8169: remove rtl_hw_init_8168ep
rtl_hw_init_8168ep() can be removed, this simplifies the code. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/realtek/r8169.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 8e404186ef87..c6969465303e 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7047,21 +7047,15 @@ static void rtl_hw_init_8168g(struct rtl8169_private *tp)
return;
}
-static void rtl_hw_init_8168ep(struct rtl8169_private *tp)
-{
- rtl8168ep_stop_cmac(tp);
- rtl_hw_init_8168g(tp);
-}
-
static void rtl_hw_initialize(struct rtl8169_private *tp)
{
switch (tp->mac_version) {
+ case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_51:
+ rtl8168ep_stop_cmac(tp);
+ /* fall through */
case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_48:
rtl_hw_init_8168g(tp);
break;
- case RTL_GIGA_MAC_VER_49 ... RTL_GIGA_MAC_VER_51:
- rtl_hw_init_8168ep(tp);
- break;
default:
break;
}