aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2013-02-19 23:06:06 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-03-08 03:55:15 -0500
commit53aa82da090222a0eec2956cf9d8409326adca40 (patch)
treecb7a80f2dd5864c7979da2c1fe0d52732cb126b6
parent17e813ec8c8cd0b08b80437f436d1d78f70b8403 (diff)
e1000e: cleanup SPACING checkpatch checks
CHECK:SPACING: No space is necessary after a cast CHECK:SPACING: space prohibited before semicolon Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/e1000e/ethtool.c16
-rw-r--r--drivers/net/ethernet/intel/e1000e/ich8lan.c4
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c10
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c2
4 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index b328943ae003..07ef74e7144d 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -925,7 +925,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
925 } 925 }
926 926
927 /* If Checksum is not Correct return error else test passed */ 927 /* If Checksum is not Correct return error else test passed */
928 if ((checksum != (u16) NVM_SUM) && !(*data)) 928 if ((checksum != (u16)NVM_SUM) && !(*data))
929 *data = 2; 929 *data = 2;
930 930
931 return *data; 931 return *data;
@@ -933,7 +933,7 @@ static int e1000_eeprom_test(struct e1000_adapter *adapter, u64 *data)
933 933
934static irqreturn_t e1000_test_intr(int __always_unused irq, void *data) 934static irqreturn_t e1000_test_intr(int __always_unused irq, void *data)
935{ 935{
936 struct net_device *netdev = (struct net_device *) data; 936 struct net_device *netdev = (struct net_device *)data;
937 struct e1000_adapter *adapter = netdev_priv(netdev); 937 struct e1000_adapter *adapter = netdev_priv(netdev);
938 struct e1000_hw *hw = &adapter->hw; 938 struct e1000_hw *hw = &adapter->hw;
939 939
@@ -1158,8 +1158,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
1158 tx_ring->next_to_use = 0; 1158 tx_ring->next_to_use = 0;
1159 tx_ring->next_to_clean = 0; 1159 tx_ring->next_to_clean = 0;
1160 1160
1161 ew32(TDBAL(0), ((u64) tx_ring->dma & 0x00000000FFFFFFFF)); 1161 ew32(TDBAL(0), ((u64)tx_ring->dma & 0x00000000FFFFFFFF));
1162 ew32(TDBAH(0), ((u64) tx_ring->dma >> 32)); 1162 ew32(TDBAH(0), ((u64)tx_ring->dma >> 32));
1163 ew32(TDLEN(0), tx_ring->count * sizeof(struct e1000_tx_desc)); 1163 ew32(TDLEN(0), tx_ring->count * sizeof(struct e1000_tx_desc));
1164 ew32(TDH(0), 0); 1164 ew32(TDH(0), 0);
1165 ew32(TDT(0), 0); 1165 ew32(TDT(0), 0);
@@ -1222,8 +1222,8 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
1222 rctl = er32(RCTL); 1222 rctl = er32(RCTL);
1223 if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX)) 1223 if (!(adapter->flags2 & FLAG2_NO_DISABLE_RX))
1224 ew32(RCTL, rctl & ~E1000_RCTL_EN); 1224 ew32(RCTL, rctl & ~E1000_RCTL_EN);
1225 ew32(RDBAL(0), ((u64) rx_ring->dma & 0xFFFFFFFF)); 1225 ew32(RDBAL(0), ((u64)rx_ring->dma & 0xFFFFFFFF));
1226 ew32(RDBAH(0), ((u64) rx_ring->dma >> 32)); 1226 ew32(RDBAH(0), ((u64)rx_ring->dma >> 32));
1227 ew32(RDLEN(0), rx_ring->size); 1227 ew32(RDLEN(0), rx_ring->size);
1228 ew32(RDH(0), 0); 1228 ew32(RDH(0), 0);
1229 ew32(RDT(0), 0); 1229 ew32(RDT(0), 0);
@@ -1986,11 +1986,11 @@ static void e1000_get_ethtool_stats(struct net_device *netdev,
1986 for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) { 1986 for (i = 0; i < E1000_GLOBAL_STATS_LEN; i++) {
1987 switch (e1000_gstrings_stats[i].type) { 1987 switch (e1000_gstrings_stats[i].type) {
1988 case NETDEV_STATS: 1988 case NETDEV_STATS:
1989 p = (char *) &net_stats + 1989 p = (char *)&net_stats +
1990 e1000_gstrings_stats[i].stat_offset; 1990 e1000_gstrings_stats[i].stat_offset;
1991 break; 1991 break;
1992 case E1000_STATS: 1992 case E1000_STATS:
1993 p = (char *) adapter + 1993 p = (char *)adapter +
1994 e1000_gstrings_stats[i].stat_offset; 1994 e1000_gstrings_stats[i].stat_offset;
1995 break; 1995 break;
1996 default: 1996 default:
diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index a18dd1ca22d9..dd67cb6dd3a8 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -3150,7 +3150,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
3150 flash_linear_addr = hw->nvm.flash_base_addr; 3150 flash_linear_addr = hw->nvm.flash_base_addr;
3151 flash_linear_addr += (bank) ? flash_bank_size : 0; 3151 flash_linear_addr += (bank) ? flash_bank_size : 0;
3152 3152
3153 for (j = 0; j < iteration ; j++) { 3153 for (j = 0; j < iteration; j++) {
3154 do { 3154 do {
3155 u32 timeout = ICH_FLASH_ERASE_COMMAND_TIMEOUT; 3155 u32 timeout = ICH_FLASH_ERASE_COMMAND_TIMEOUT;
3156 3156
@@ -3501,7 +3501,7 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
3501 if (mac->type == e1000_ich8lan) 3501 if (mac->type == e1000_ich8lan)
3502 snoop = PCIE_ICH8_SNOOP_ALL; 3502 snoop = PCIE_ICH8_SNOOP_ALL;
3503 else 3503 else
3504 snoop = (u32) ~(PCIE_NO_SNOOP_ALL); 3504 snoop = (u32)~(PCIE_NO_SNOOP_ALL);
3505 e1000e_set_pcie_no_snoop(hw, snoop); 3505 e1000e_set_pcie_no_snoop(hw, snoop);
3506 3506
3507 ctrl_ext = er32(CTRL_EXT); 3507 ctrl_ext = er32(CTRL_EXT);
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 9d76edcca62d..ca1c10e5f69b 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4452,7 +4452,7 @@ static void e1000e_update_phy_task(struct work_struct *work)
4452 **/ 4452 **/
4453static void e1000_update_phy_info(unsigned long data) 4453static void e1000_update_phy_info(unsigned long data)
4454{ 4454{
4455 struct e1000_adapter *adapter = (struct e1000_adapter *) data; 4455 struct e1000_adapter *adapter = (struct e1000_adapter *)data;
4456 4456
4457 if (test_bit(__E1000_DOWN, &adapter->state)) 4457 if (test_bit(__E1000_DOWN, &adapter->state))
4458 return; 4458 return;
@@ -4784,7 +4784,7 @@ static void e1000e_check_82574_phy_workaround(struct e1000_adapter *adapter)
4784 **/ 4784 **/
4785static void e1000_watchdog(unsigned long data) 4785static void e1000_watchdog(unsigned long data)
4786{ 4786{
4787 struct e1000_adapter *adapter = (struct e1000_adapter *) data; 4787 struct e1000_adapter *adapter = (struct e1000_adapter *)data;
4788 4788
4789 /* Do the rest outside of interrupt context */ 4789 /* Do the rest outside of interrupt context */
4790 schedule_work(&adapter->watchdog_task); 4790 schedule_work(&adapter->watchdog_task);
@@ -5350,7 +5350,7 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
5350 if (skb->len <= MINIMUM_DHCP_PACKET_SIZE) 5350 if (skb->len <= MINIMUM_DHCP_PACKET_SIZE)
5351 return 0; 5351 return 0;
5352 5352
5353 if (((struct ethhdr *) skb->data)->h_proto != htons(ETH_P_IP)) 5353 if (((struct ethhdr *)skb->data)->h_proto != htons(ETH_P_IP))
5354 return 0; 5354 return 0;
5355 5355
5356 { 5356 {
@@ -6727,11 +6727,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
6727 6727
6728 init_timer(&adapter->watchdog_timer); 6728 init_timer(&adapter->watchdog_timer);
6729 adapter->watchdog_timer.function = e1000_watchdog; 6729 adapter->watchdog_timer.function = e1000_watchdog;
6730 adapter->watchdog_timer.data = (unsigned long) adapter; 6730 adapter->watchdog_timer.data = (unsigned long)adapter;
6731 6731
6732 init_timer(&adapter->phy_info_timer); 6732 init_timer(&adapter->phy_info_timer);
6733 adapter->phy_info_timer.function = e1000_update_phy_info; 6733 adapter->phy_info_timer.function = e1000_update_phy_info;
6734 adapter->phy_info_timer.data = (unsigned long) adapter; 6734 adapter->phy_info_timer.data = (unsigned long)adapter;
6735 6735
6736 INIT_WORK(&adapter->reset_task, e1000_reset_task); 6736 INIT_WORK(&adapter->reset_task, e1000_reset_task);
6737 INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task); 6737 INIT_WORK(&adapter->watchdog_task, e1000_watchdog_task);
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 8ff0060e0ed6..50e84ed3dc86 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -175,7 +175,7 @@ s32 e1000e_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
175 e_dbg("MDI Error\n"); 175 e_dbg("MDI Error\n");
176 return -E1000_ERR_PHY; 176 return -E1000_ERR_PHY;
177 } 177 }
178 *data = (u16) mdic; 178 *data = (u16)mdic;
179 179
180 /* Allow some time after each MDIC transaction to avoid 180 /* Allow some time after each MDIC transaction to avoid
181 * reading duplicate data in the next MDIC transaction. 181 * reading duplicate data in the next MDIC transaction.