|
@@ -925,7 +925,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
|
|
|
}
|
|
|
|
|
|
/* If Checksum is not Correct return error else test passed */
|
|
|
- if ((checksum != (u16) NVM_SUM) && !(*data))
|
|
|
+ if ((checksum != (u16)NVM_SUM) && !(*data))
|
|
|
*data = 2;
|
|
|
|
|
|
return *data;
|
|
@@ -933,7 +933,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
|
|
|
|
|
|
static irqreturn_t e1000_test_intr(int __always_unused irq, void *data)
|
|
|
{
|
|
|
- struct net_device *netdev = (struct net_device *) data;
|
|
|
+ struct net_device *netdev = (struct net_device *)data;
|
|
|
struct e1000_adapter *adapter = netdev_priv(netdev);
|
|
|
struct e1000_hw *hw = &adapter->hw;
|
|
|
|
|
@@ -1158,8 +1158,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
|
|
|
tx_ring->next_to_use = 0;
|
|
|
tx_ring->next_to_clean = 0;
|
|
|
|
|
|
- ew32(TDBAL(0), ((u64) tx_ring->dma & 0x00000000FFFFFFFF));
|
|
|
- ew32(TDBAH(0), ((u64) tx_ring->dma >> 32));
|
|
|
+ ew32(TDBAL(0), ((u64)tx_ring->dma & 0x00000000FFFFFFFF));
|
|
|
+ ew32(TDBAH(0), ((u64)tx_ring->dma >> 32));
|
|
|
ew32(TDLEN(0), tx_ring->count * sizeof(struct e1000_tx_desc));
|
|
|
ew32(TDH(0), 0);
|
|
|
ew32(TDT(0), 0);
|
|
@@ -1222,8 +1222,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
|
|
|
rctl = er32(RCTL);
|
|
|
if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX))
|
|
|
ew32(RCTL, rctl & ~E1000_RCTL_EN);
|
|
|
- ew32(RDBAL(0), ((u64) rx_ring->dma & 0xFFFFFFFF));
|
|
|
- ew32(RDBAH(0), ((u64) rx_ring->dma >> 32));
|
|
|
+ ew32(RDBAL(0), ((u64)rx_ring->dma & 0xFFFFFFFF));
|
|
|
+ ew32(RDBAH(0), ((u64)rx_ring->dma >> 32));
|
|
|
ew32(RDLEN(0), rx_ring->size);
|
|
|
ew32(RDH(0), 0);
|
|
|
ew32(RDT(0), 0);
|
|
@@ -1986,11 +1986,11 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
|
|
|
for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
|
|
|
switch (e1000_gstrings_stats[i].type) {
|
|
|
case NETDEV_STATS:
|
|
|
- p = (char *) &net_stats +
|
|
|
+ p = (char *)&net_stats +
|
|
|
e1000_gstrings_stats[i].stat_offset;
|
|
|
break;
|
|
|
case E1000_STATS:
|
|
|
- p = (char *) adapter +
|
|
|
+ p = (char *)adapter +
|
|
|
e1000_gstrings_stats[i].stat_offset;
|
|
|
break;
|
|
|
default:
|