r8169: drop rtl_generic_op

Only two places are left where rtl_generic_op() is used, so we can
inline it and simplify the code a little.
This change also avoids the overhead of unlocking/locking in case
the respective operation isn't set.

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

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 41f9b5c2bc0dd63bc9163bce6372439181a01853..7703503e61ff83d1971730ce8425e3266575ef1b 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -4764,13 +4764,6 @@ static void r8168_pll_power_up(struct rtl8169_private *tp)
        r8168_phy_power_up(tp);
 }
 
-static void rtl_generic_op(struct rtl8169_private *tp,
-                          void (*op)(struct rtl8169_private *))
-{
-       if (op)
-               op(tp);
-}
-
 static void rtl_pll_power_down(struct rtl8169_private *tp)
 {
        switch (tp->mac_version) {
@@ -4821,16 +4814,20 @@ static void rtl8169_init_ring_indexes(struct rtl8169_private *tp)
 
 static void rtl_hw_jumbo_enable(struct rtl8169_private *tp)
 {
-       RTL_W8(tp, Cfg9346, Cfg9346_Unlock);
-       rtl_generic_op(tp, tp->jumbo_ops.enable);
-       RTL_W8(tp, Cfg9346, Cfg9346_Lock);
+       if (tp->jumbo_ops.enable) {
+               RTL_W8(tp, Cfg9346, Cfg9346_Unlock);
+               tp->jumbo_ops.enable(tp);
+               RTL_W8(tp, Cfg9346, Cfg9346_Lock);
+       }
 }
 
 static void rtl_hw_jumbo_disable(struct rtl8169_private *tp)
 {
-       RTL_W8(tp, Cfg9346, Cfg9346_Unlock);
-       rtl_generic_op(tp, tp->jumbo_ops.disable);
-       RTL_W8(tp, Cfg9346, Cfg9346_Lock);
+       if (tp->jumbo_ops.disable) {
+               RTL_W8(tp, Cfg9346, Cfg9346_Unlock);
+               tp->jumbo_ops.disable(tp);
+               RTL_W8(tp, Cfg9346, Cfg9346_Lock);
+       }
 }
 
 static void r8168c_hw_jumbo_enable(struct rtl8169_private *tp)