r8152: move the default coalesce setting for RTL8153
authorhayeswang <hayeswang@realtek.com>
Fri, 9 Jun 2017 09:11:44 +0000 (17:11 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Jun 2017 19:37:01 +0000 (15:37 -0400)
Only RTL8153 could set coalesce, so move the default setting for
rtl8152_probe() to r8153_init().

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/r8152.c

index 565ac5b8b9ca1ba6a9101bab67a750c185163c49..f78111c1ae406f7cfe89806b2e19b9856bbd22cd 100644 (file)
@@ -3579,6 +3579,19 @@ static void r8153_init(struct r8152 *tp)
        ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
 
        rtl_tally_reset(tp);
+
+       switch (tp->udev->speed) {
+       case USB_SPEED_SUPER:
+       case USB_SPEED_SUPER_PLUS:
+               tp->coalesce = COALESCE_SUPER;
+               break;
+       case USB_SPEED_HIGH:
+               tp->coalesce = COALESCE_HIGH;
+               break;
+       default:
+               tp->coalesce = COALESCE_SLOW;
+               break;
+       }
 }
 
 static int rtl8152_pre_reset(struct usb_interface *intf)
@@ -4524,19 +4537,6 @@ static int rtl8152_probe(struct usb_interface *intf,
        tp->mii.reg_num_mask = 0x1f;
        tp->mii.phy_id = R8152_PHY_ID;
 
-       switch (udev->speed) {
-       case USB_SPEED_SUPER:
-       case USB_SPEED_SUPER_PLUS:
-               tp->coalesce = COALESCE_SUPER;
-               break;
-       case USB_SPEED_HIGH:
-               tp->coalesce = COALESCE_HIGH;
-               break;
-       default:
-               tp->coalesce = COALESCE_SLOW;
-               break;
-       }
-
        tp->autoneg = AUTONEG_ENABLE;
        tp->speed = tp->mii.supports_gmii ? SPEED_1000 : SPEED_100;
        tp->duplex = DUPLEX_FULL;