Revert "aqc111: fix double endianness swap on BE"
authorIgor Russkikh <Igor.Russkikh@aquantia.com>
Thu, 16 May 2019 14:52:20 +0000 (14:52 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 May 2019 21:22:13 +0000 (14:22 -0700)
This reverts commit 2cf672709beb005f6e90cb4edbed6f2218ba953e.

The required temporary storage is already done inside of write32/16
helpers.

Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/aqc111.c

index b86c5ce9a92aca4212c83018045bb1832c67c5a0..599d560a8450bcd2784289a32c152ca9d7e6cf36 100644 (file)
@@ -1428,7 +1428,7 @@ static int aqc111_resume(struct usb_interface *intf)
 {
        struct usbnet *dev = usb_get_intfdata(intf);
        struct aqc111_data *aqc111_data = dev->driver_priv;
-       u16 reg16, oldreg16;
+       u16 reg16;
        u8 reg8;
 
        netif_carrier_off(dev->net);
@@ -1444,11 +1444,9 @@ static int aqc111_resume(struct usb_interface *intf)
        /* Configure RX control register => start operation */
        reg16 = aqc111_data->rxctl;
        reg16 &= ~SFR_RX_CTL_START;
-       /* needs to be saved in case endianness is swapped */
-       oldreg16 = reg16;
        aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16);
 
-       reg16 = oldreg16 | SFR_RX_CTL_START;
+       reg16 |= SFR_RX_CTL_START;
        aqc111_write16_cmd_nopm(dev, AQ_ACCESS_MAC, SFR_RX_CTL, 2, &reg16);
 
        aqc111_set_phy_speed(dev, aqc111_data->autoneg,