diff options
author | Joe Perches <joe@perches.com> | 2008-07-11 18:17:18 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-22 19:38:52 -0400 |
commit | e982f17c87488a98df6bc4f5454a176646b4d00b (patch) | |
tree | d615c679fbe14c877722c3a906d3322e4382f8aa /drivers/net/e1000/e1000_ethtool.c | |
parent | c03e83b0351f8a9464d32f31302ec75ba88518dc (diff) |
e1000: Remove spaces after casts and function names
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index e262605c4700..f9ac9a87ffab 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -881,7 +881,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data) | |||
881 | } | 881 | } |
882 | 882 | ||
883 | /* If Checksum is not Correct return error else test passed */ | 883 | /* If Checksum is not Correct return error else test passed */ |
884 | if ((checksum != (u16) EEPROM_SUM) && !(*data)) | 884 | if ((checksum != (u16)EEPROM_SUM) && !(*data)) |
885 | *data = 2; | 885 | *data = 2; |
886 | 886 | ||
887 | return *data; | 887 | return *data; |
@@ -889,7 +889,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data) | |||
889 | 889 | ||
890 | static irqreturn_t e1000_test_intr(int irq, void *data) | 890 | static irqreturn_t e1000_test_intr(int irq, void *data) |
891 | { | 891 | { |
892 | struct net_device *netdev = (struct net_device *) data; | 892 | struct net_device *netdev = (struct net_device *)data; |
893 | struct e1000_adapter *adapter = netdev_priv(netdev); | 893 | struct e1000_adapter *adapter = netdev_priv(netdev); |
894 | struct e1000_hw *hw = &adapter->hw; | 894 | struct e1000_hw *hw = &adapter->hw; |
895 | 895 | ||
@@ -1074,8 +1074,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
1074 | memset(txdr->desc, 0, txdr->size); | 1074 | memset(txdr->desc, 0, txdr->size); |
1075 | txdr->next_to_use = txdr->next_to_clean = 0; | 1075 | txdr->next_to_use = txdr->next_to_clean = 0; |
1076 | 1076 | ||
1077 | ew32(TDBAL, ((u64) txdr->dma & 0x00000000FFFFFFFF)); | 1077 | ew32(TDBAL, ((u64)txdr->dma & 0x00000000FFFFFFFF)); |
1078 | ew32(TDBAH, ((u64) txdr->dma >> 32)); | 1078 | ew32(TDBAH, ((u64)txdr->dma >> 32)); |
1079 | ew32(TDLEN, txdr->count * sizeof(struct e1000_tx_desc)); | 1079 | ew32(TDLEN, txdr->count * sizeof(struct e1000_tx_desc)); |
1080 | ew32(TDH, 0); | 1080 | ew32(TDH, 0); |
1081 | ew32(TDT, 0); | 1081 | ew32(TDT, 0); |
@@ -1128,8 +1128,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter) | |||
1128 | 1128 | ||
1129 | rctl = er32(RCTL); | 1129 | rctl = er32(RCTL); |
1130 | ew32(RCTL, rctl & ~E1000_RCTL_EN); | 1130 | ew32(RCTL, rctl & ~E1000_RCTL_EN); |
1131 | ew32(RDBAL, ((u64) rxdr->dma & 0xFFFFFFFF)); | 1131 | ew32(RDBAL, ((u64)rxdr->dma & 0xFFFFFFFF)); |
1132 | ew32(RDBAH, ((u64) rxdr->dma >> 32)); | 1132 | ew32(RDBAH, ((u64)rxdr->dma >> 32)); |
1133 | ew32(RDLEN, rxdr->size); | 1133 | ew32(RDLEN, rxdr->size); |
1134 | ew32(RDH, 0); | 1134 | ew32(RDH, 0); |
1135 | ew32(RDT, 0); | 1135 | ew32(RDT, 0); |
@@ -1863,7 +1863,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data) | |||
1863 | if (!adapter->blink_timer.function) { | 1863 | if (!adapter->blink_timer.function) { |
1864 | init_timer(&adapter->blink_timer); | 1864 | init_timer(&adapter->blink_timer); |
1865 | adapter->blink_timer.function = e1000_led_blink_callback; | 1865 | adapter->blink_timer.function = e1000_led_blink_callback; |
1866 | adapter->blink_timer.data = (unsigned long) adapter; | 1866 | adapter->blink_timer.data = (unsigned long)adapter; |
1867 | } | 1867 | } |
1868 | e1000_setup_led(hw); | 1868 | e1000_setup_led(hw); |
1869 | mod_timer(&adapter->blink_timer, jiffies); | 1869 | mod_timer(&adapter->blink_timer, jiffies); |
@@ -1873,7 +1873,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data) | |||
1873 | if (!adapter->blink_timer.function) { | 1873 | if (!adapter->blink_timer.function) { |
1874 | init_timer(&adapter->blink_timer); | 1874 | init_timer(&adapter->blink_timer); |
1875 | adapter->blink_timer.function = e1000_led_blink_callback; | 1875 | adapter->blink_timer.function = e1000_led_blink_callback; |
1876 | adapter->blink_timer.data = (unsigned long) adapter; | 1876 | adapter->blink_timer.data = (unsigned long)adapter; |
1877 | } | 1877 | } |
1878 | mod_timer(&adapter->blink_timer, jiffies); | 1878 | mod_timer(&adapter->blink_timer, jiffies); |
1879 | msleep_interruptible(data * 1000); | 1879 | msleep_interruptible(data * 1000); |