aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2008-07-11 18:17:18 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-07-22 19:38:52 -0400
commite982f17c87488a98df6bc4f5454a176646b4d00b (patch)
treed615c679fbe14c877722c3a906d3322e4382f8aa /drivers/net/e1000/e1000_main.c
parentc03e83b0351f8a9464d32f31302ec75ba88518dc (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_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index ad1f052c3d3a..cb44fded47ed 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1056,7 +1056,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
1056 1056
1057 init_timer(&adapter->tx_fifo_stall_timer); 1057 init_timer(&adapter->tx_fifo_stall_timer);
1058 adapter->tx_fifo_stall_timer.function = &e1000_82547_tx_fifo_stall; 1058 adapter->tx_fifo_stall_timer.function = &e1000_82547_tx_fifo_stall;
1059 adapter->tx_fifo_stall_timer.data = (unsigned long) adapter; 1059 adapter->tx_fifo_stall_timer.data = (unsigned long)adapter;
1060 1060
1061 init_timer(&adapter->watchdog_timer); 1061 init_timer(&adapter->watchdog_timer);
1062 adapter->watchdog_timer.function = &e1000_watchdog; 1062 adapter->watchdog_timer.function = &e1000_watchdog;
@@ -1064,7 +1064,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
1064 1064
1065 init_timer(&adapter->phy_info_timer); 1065 init_timer(&adapter->phy_info_timer);
1066 adapter->phy_info_timer.function = &e1000_update_phy_info; 1066 adapter->phy_info_timer.function = &e1000_update_phy_info;
1067 adapter->phy_info_timer.data = (unsigned long) adapter; 1067 adapter->phy_info_timer.data = (unsigned long)adapter;
1068 1068
1069 INIT_WORK(&adapter->reset_task, e1000_reset_task); 1069 INIT_WORK(&adapter->reset_task, e1000_reset_task);
1070 1070
@@ -1542,7 +1542,7 @@ static bool e1000_check_64k_bound(struct e1000_adapter *adapter, void *start,
1542 unsigned long len) 1542 unsigned long len)
1543{ 1543{
1544 struct e1000_hw *hw = &adapter->hw; 1544 struct e1000_hw *hw = &adapter->hw;
1545 unsigned long begin = (unsigned long) start; 1545 unsigned long begin = (unsigned long)start;
1546 unsigned long end = begin + len; 1546 unsigned long end = begin + len;
1547 1547
1548 /* First rev 82545 and 82546 need to not allow any memory 1548 /* First rev 82545 and 82546 need to not allow any memory
@@ -2538,7 +2538,7 @@ static void e1000_set_rx_mode(struct net_device *netdev)
2538 2538
2539static void e1000_update_phy_info(unsigned long data) 2539static void e1000_update_phy_info(unsigned long data)
2540{ 2540{
2541 struct e1000_adapter *adapter = (struct e1000_adapter *) data; 2541 struct e1000_adapter *adapter = (struct e1000_adapter *)data;
2542 struct e1000_hw *hw = &adapter->hw; 2542 struct e1000_hw *hw = &adapter->hw;
2543 e1000_phy_get_info(hw, &adapter->phy_info); 2543 e1000_phy_get_info(hw, &adapter->phy_info);
2544} 2544}
@@ -2550,7 +2550,7 @@ static void e1000_update_phy_info(unsigned long data)
2550 2550
2551static void e1000_82547_tx_fifo_stall(unsigned long data) 2551static void e1000_82547_tx_fifo_stall(unsigned long data)
2552{ 2552{
2553 struct e1000_adapter *adapter = (struct e1000_adapter *) data; 2553 struct e1000_adapter *adapter = (struct e1000_adapter *)data;
2554 struct e1000_hw *hw = &adapter->hw; 2554 struct e1000_hw *hw = &adapter->hw;
2555 struct net_device *netdev = adapter->netdev; 2555 struct net_device *netdev = adapter->netdev;
2556 u32 tctl; 2556 u32 tctl;
@@ -2583,7 +2583,7 @@ static void e1000_82547_tx_fifo_stall(unsigned long data)
2583 **/ 2583 **/
2584static void e1000_watchdog(unsigned long data) 2584static void e1000_watchdog(unsigned long data)
2585{ 2585{
2586 struct e1000_adapter *adapter = (struct e1000_adapter *) data; 2586 struct e1000_adapter *adapter = (struct e1000_adapter *)data;
2587 struct e1000_hw *hw = &adapter->hw; 2587 struct e1000_hw *hw = &adapter->hw;
2588 struct net_device *netdev = adapter->netdev; 2588 struct net_device *netdev = adapter->netdev;
2589 struct e1000_tx_ring *txdr = adapter->tx_ring; 2589 struct e1000_tx_ring *txdr = adapter->tx_ring;
@@ -3225,7 +3225,7 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter,
3225 return 0; 3225 return 0;
3226 } 3226 }
3227 if (skb->len > MINIMUM_DHCP_PACKET_SIZE) { 3227 if (skb->len > MINIMUM_DHCP_PACKET_SIZE) {
3228 struct ethhdr *eth = (struct ethhdr *) skb->data; 3228 struct ethhdr *eth = (struct ethhdr *)skb->data;
3229 if ((htons(ETH_P_IP) == eth->h_proto)) { 3229 if ((htons(ETH_P_IP) == eth->h_proto)) {
3230 const struct iphdr *ip = 3230 const struct iphdr *ip =
3231 (struct iphdr *)((u8 *)skb->data+14); 3231 (struct iphdr *)((u8 *)skb->data+14);