--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
-@@ -3977,29 +3977,10 @@ static void rtl_reset_bmu(struct r8152 *
+@@ -3983,29 +3983,10 @@ static void rtl_reset_bmu(struct r8152 *
/* Clear the bp to stop the firmware before loading a new one */
static void rtl_clear_bp(struct r8152 *tp, u16 type)
{
case RTL_VER_08:
case RTL_VER_09:
case RTL_VER_10:
-@@ -4007,32 +3988,31 @@ static void rtl_clear_bp(struct r8152 *t
+@@ -4013,32 +3994,31 @@ static void rtl_clear_bp(struct r8152 *t
case RTL_VER_12:
case RTL_VER_13:
case RTL_VER_15:
/* wait 3 ms to make sure the firmware is stopped */
usleep_range(3000, 6000);
-@@ -5009,10 +4989,9 @@ static void rtl8152_fw_phy_nc_apply(stru
+@@ -5015,10 +4995,9 @@ static void rtl8152_fw_phy_nc_apply(stru
static void rtl8152_fw_mac_apply(struct r8152 *tp, struct fw_mac *mac)
{
switch (__le32_to_cpu(mac->blk_hdr.type)) {
case RTL_FW_PLA:
-@@ -5054,12 +5033,8 @@ static void rtl8152_fw_mac_apply(struct
+@@ -5060,12 +5039,8 @@ static void rtl8152_fw_mac_apply(struct
ocp_write_word(tp, type, __le16_to_cpu(mac->bp_ba_addr),
__le16_to_cpu(mac->bp_ba_value));