|
@@ -318,9 +318,8 @@ u32 b43_lcntab_read(struct b43_wldev *dev, u32 offset)
|
|
|
break;
|
|
|
case B43_LCNTAB_32BIT:
|
|
|
b43_phy_write(dev, B43_PHY_LCN_TABLE_ADDR, offset);
|
|
|
- value = b43_phy_read(dev, B43_PHY_LCN_TABLE_DATAHI);
|
|
|
- value <<= 16;
|
|
|
- value |= b43_phy_read(dev, B43_PHY_LCN_TABLE_DATALO);
|
|
|
+ value = b43_phy_read(dev, B43_PHY_LCN_TABLE_DATALO);
|
|
|
+ value |= (b43_phy_read(dev, B43_PHY_LCN_TABLE_DATAHI) << 16);
|
|
|
break;
|
|
|
default:
|
|
|
B43_WARN_ON(1);
|
|
@@ -357,10 +356,9 @@ void b43_lcntab_read_bulk(struct b43_wldev *dev, u32 offset,
|
|
|
break;
|
|
|
case B43_LCNTAB_32BIT:
|
|
|
*((u32 *)data) = b43_phy_read(dev,
|
|
|
- B43_PHY_LCN_TABLE_DATAHI);
|
|
|
- *((u32 *)data) <<= 16;
|
|
|
- *((u32 *)data) |= b43_phy_read(dev,
|
|
|
B43_PHY_LCN_TABLE_DATALO);
|
|
|
+ *((u32 *)data) |= (b43_phy_read(dev,
|
|
|
+ B43_PHY_LCN_TABLE_DATAHI) << 16);
|
|
|
data += 4;
|
|
|
break;
|
|
|
default:
|