diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2008-07-08 18:52:33 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-11 01:20:29 -0400 |
commit | 1459336da45b214a59f0825777549fb0cb60ed7d (patch) | |
tree | 88f586c7fec4e215ce2dcd52e7f601ddc44977bb /drivers/net/ixgb | |
parent | 52035bdbe8229c6bffae0be3444924ffbccf6506 (diff) |
ixgb: trivial fix space after for
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/ixgb')
-rw-r--r-- | drivers/net/ixgb/ixgb_ee.c | 10 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_ethtool.c | 14 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_hw.c | 21 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 12 | ||||
-rw-r--r-- | drivers/net/ixgb/ixgb_param.c | 2 |
5 files changed, 28 insertions, 31 deletions
diff --git a/drivers/net/ixgb/ixgb_ee.c b/drivers/net/ixgb/ixgb_ee.c index aa71b9b1cc98..4a9e52f90711 100644 --- a/drivers/net/ixgb/ixgb_ee.c +++ b/drivers/net/ixgb/ixgb_ee.c | |||
@@ -152,7 +152,7 @@ ixgb_shift_in_bits(struct ixgb_hw *hw) | |||
152 | eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI); | 152 | eecd_reg &= ~(IXGB_EECD_DO | IXGB_EECD_DI); |
153 | data = 0; | 153 | data = 0; |
154 | 154 | ||
155 | for(i = 0; i < 16; i++) { | 155 | for (i = 0; i < 16; i++) { |
156 | data = data << 1; | 156 | data = data << 1; |
157 | ixgb_raise_clock(hw, &eecd_reg); | 157 | ixgb_raise_clock(hw, &eecd_reg); |
158 | 158 | ||
@@ -297,7 +297,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw *hw) | |||
297 | * signal that the command has been completed by raising the DO signal. | 297 | * signal that the command has been completed by raising the DO signal. |
298 | * If DO does not go high in 10 milliseconds, then error out. | 298 | * If DO does not go high in 10 milliseconds, then error out. |
299 | */ | 299 | */ |
300 | for(i = 0; i < 200; i++) { | 300 | for (i = 0; i < 200; i++) { |
301 | eecd_reg = IXGB_READ_REG(hw, EECD); | 301 | eecd_reg = IXGB_READ_REG(hw, EECD); |
302 | 302 | ||
303 | if (eecd_reg & IXGB_EECD_DO) | 303 | if (eecd_reg & IXGB_EECD_DO) |
@@ -328,7 +328,7 @@ ixgb_validate_eeprom_checksum(struct ixgb_hw *hw) | |||
328 | u16 checksum = 0; | 328 | u16 checksum = 0; |
329 | u16 i; | 329 | u16 i; |
330 | 330 | ||
331 | for(i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) | 331 | for (i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) |
332 | checksum += ixgb_read_eeprom(hw, i); | 332 | checksum += ixgb_read_eeprom(hw, i); |
333 | 333 | ||
334 | if (checksum == (u16) EEPROM_SUM) | 334 | if (checksum == (u16) EEPROM_SUM) |
@@ -351,7 +351,7 @@ ixgb_update_eeprom_checksum(struct ixgb_hw *hw) | |||
351 | u16 checksum = 0; | 351 | u16 checksum = 0; |
352 | u16 i; | 352 | u16 i; |
353 | 353 | ||
354 | for(i = 0; i < EEPROM_CHECKSUM_REG; i++) | 354 | for (i = 0; i < EEPROM_CHECKSUM_REG; i++) |
355 | checksum += ixgb_read_eeprom(hw, i); | 355 | checksum += ixgb_read_eeprom(hw, i); |
356 | 356 | ||
357 | checksum = (u16) EEPROM_SUM - checksum; | 357 | checksum = (u16) EEPROM_SUM - checksum; |
@@ -472,7 +472,7 @@ ixgb_get_eeprom_data(struct ixgb_hw *hw) | |||
472 | ee_map = (struct ixgb_ee_map_type *)hw->eeprom; | 472 | ee_map = (struct ixgb_ee_map_type *)hw->eeprom; |
473 | 473 | ||
474 | DEBUGOUT("ixgb_ee: Reading eeprom data\n"); | 474 | DEBUGOUT("ixgb_ee: Reading eeprom data\n"); |
475 | for(i = 0; i < IXGB_EEPROM_SIZE ; i++) { | 475 | for (i = 0; i < IXGB_EEPROM_SIZE ; i++) { |
476 | u16 ee_data; | 476 | u16 ee_data; |
477 | ee_data = ixgb_read_eeprom(hw, i); | 477 | ee_data = ixgb_read_eeprom(hw, i); |
478 | checksum += ee_data; | 478 | checksum += ee_data; |
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c index 5b354e3122c4..e1836c16ab3d 100644 --- a/drivers/net/ixgb/ixgb_ethtool.c +++ b/drivers/net/ixgb/ixgb_ethtool.c | |||
@@ -301,7 +301,7 @@ ixgb_get_regs(struct net_device *netdev, | |||
301 | *reg++ = IXGB_READ_REG(hw, RXCSUM); /* 20 */ | 301 | *reg++ = IXGB_READ_REG(hw, RXCSUM); /* 20 */ |
302 | 302 | ||
303 | /* there are 16 RAR entries in hardware, we only use 3 */ | 303 | /* there are 16 RAR entries in hardware, we only use 3 */ |
304 | for(i = 0; i < IXGB_ALL_RAR_ENTRIES; i++) { | 304 | for (i = 0; i < IXGB_ALL_RAR_ENTRIES; i++) { |
305 | *reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i << 1)); /*21,...,51 */ | 305 | *reg++ = IXGB_READ_REG_ARRAY(hw, RAL, (i << 1)); /*21,...,51 */ |
306 | *reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i << 1)); /*22,...,52 */ | 306 | *reg++ = IXGB_READ_REG_ARRAY(hw, RAH, (i << 1)); /*22,...,52 */ |
307 | } | 307 | } |
@@ -441,12 +441,10 @@ ixgb_get_eeprom(struct net_device *netdev, | |||
441 | return -ENOMEM; | 441 | return -ENOMEM; |
442 | 442 | ||
443 | /* note the eeprom was good because the driver loaded */ | 443 | /* note the eeprom was good because the driver loaded */ |
444 | for(i = 0; i <= (last_word - first_word); i++) { | 444 | for (i = 0; i <= (last_word - first_word); i++) |
445 | eeprom_buff[i] = ixgb_get_eeprom_word(hw, (first_word + i)); | 445 | eeprom_buff[i] = ixgb_get_eeprom_word(hw, (first_word + i)); |
446 | } | ||
447 | 446 | ||
448 | memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), | 447 | memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 1), eeprom->len); |
449 | eeprom->len); | ||
450 | kfree(eeprom_buff); | 448 | kfree(eeprom_buff); |
451 | 449 | ||
452 | geeprom_error: | 450 | geeprom_error: |
@@ -500,7 +498,7 @@ ixgb_set_eeprom(struct net_device *netdev, | |||
500 | } | 498 | } |
501 | 499 | ||
502 | memcpy(ptr, bytes, eeprom->len); | 500 | memcpy(ptr, bytes, eeprom->len); |
503 | for(i = 0; i <= (last_word - first_word); i++) | 501 | for (i = 0; i <= (last_word - first_word); i++) |
504 | ixgb_write_eeprom(hw, first_word + i, eeprom_buff[i]); | 502 | ixgb_write_eeprom(hw, first_word + i, eeprom_buff[i]); |
505 | 503 | ||
506 | /* Update the checksum over the first part of the EEPROM if needed */ | 504 | /* Update the checksum over the first part of the EEPROM if needed */ |
@@ -666,7 +664,7 @@ ixgb_get_ethtool_stats(struct net_device *netdev, | |||
666 | int i; | 664 | int i; |
667 | 665 | ||
668 | ixgb_update_stats(adapter); | 666 | ixgb_update_stats(adapter); |
669 | for(i = 0; i < IXGB_STATS_LEN; i++) { | 667 | for (i = 0; i < IXGB_STATS_LEN; i++) { |
670 | char *p = (char *)adapter+ixgb_gstrings_stats[i].stat_offset; | 668 | char *p = (char *)adapter+ixgb_gstrings_stats[i].stat_offset; |
671 | data[i] = (ixgb_gstrings_stats[i].sizeof_stat == | 669 | data[i] = (ixgb_gstrings_stats[i].sizeof_stat == |
672 | sizeof(u64)) ? *(u64 *)p : *(u32 *)p; | 670 | sizeof(u64)) ? *(u64 *)p : *(u32 *)p; |
@@ -680,7 +678,7 @@ ixgb_get_strings(struct net_device *netdev, u32 stringset, u8 *data) | |||
680 | 678 | ||
681 | switch(stringset) { | 679 | switch(stringset) { |
682 | case ETH_SS_STATS: | 680 | case ETH_SS_STATS: |
683 | for(i=0; i < IXGB_STATS_LEN; i++) { | 681 | for (i = 0; i < IXGB_STATS_LEN; i++) { |
684 | memcpy(data + i * ETH_GSTRING_LEN, | 682 | memcpy(data + i * ETH_GSTRING_LEN, |
685 | ixgb_gstrings_stats[i].stat_string, | 683 | ixgb_gstrings_stats[i].stat_string, |
686 | ETH_GSTRING_LEN); | 684 | ETH_GSTRING_LEN); |
diff --git a/drivers/net/ixgb/ixgb_hw.c b/drivers/net/ixgb/ixgb_hw.c index 3694e8c7b005..9cc75ce9dc86 100644 --- a/drivers/net/ixgb/ixgb_hw.c +++ b/drivers/net/ixgb/ixgb_hw.c | |||
@@ -347,7 +347,7 @@ ixgb_init_hw(struct ixgb_hw *hw) | |||
347 | 347 | ||
348 | /* Zero out the Multicast HASH table */ | 348 | /* Zero out the Multicast HASH table */ |
349 | DEBUGOUT("Zeroing the MTA\n"); | 349 | DEBUGOUT("Zeroing the MTA\n"); |
350 | for(i = 0; i < IXGB_MC_TBL_SIZE; i++) | 350 | for (i = 0; i < IXGB_MC_TBL_SIZE; i++) |
351 | IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0); | 351 | IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0); |
352 | 352 | ||
353 | /* Zero out the VLAN Filter Table Array */ | 353 | /* Zero out the VLAN Filter Table Array */ |
@@ -413,7 +413,7 @@ ixgb_init_rx_addrs(struct ixgb_hw *hw) | |||
413 | 413 | ||
414 | /* Zero out the other 15 receive addresses. */ | 414 | /* Zero out the other 15 receive addresses. */ |
415 | DEBUGOUT("Clearing RAR[1-15]\n"); | 415 | DEBUGOUT("Clearing RAR[1-15]\n"); |
416 | for(i = 1; i < IXGB_RAR_ENTRIES; i++) { | 416 | for (i = 1; i < IXGB_RAR_ENTRIES; i++) { |
417 | /* Write high reg first to disable the AV bit first */ | 417 | /* Write high reg first to disable the AV bit first */ |
418 | IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0); | 418 | IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0); |
419 | IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0); | 419 | IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0); |
@@ -452,19 +452,18 @@ ixgb_mc_addr_list_update(struct ixgb_hw *hw, | |||
452 | 452 | ||
453 | /* Clear RAR[1-15] */ | 453 | /* Clear RAR[1-15] */ |
454 | DEBUGOUT(" Clearing RAR[1-15]\n"); | 454 | DEBUGOUT(" Clearing RAR[1-15]\n"); |
455 | for(i = rar_used_count; i < IXGB_RAR_ENTRIES; i++) { | 455 | for (i = rar_used_count; i < IXGB_RAR_ENTRIES; i++) { |
456 | IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0); | 456 | IXGB_WRITE_REG_ARRAY(hw, RA, (i << 1), 0); |
457 | IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0); | 457 | IXGB_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0); |
458 | } | 458 | } |
459 | 459 | ||
460 | /* Clear the MTA */ | 460 | /* Clear the MTA */ |
461 | DEBUGOUT(" Clearing MTA\n"); | 461 | DEBUGOUT(" Clearing MTA\n"); |
462 | for(i = 0; i < IXGB_MC_TBL_SIZE; i++) { | 462 | for (i = 0; i < IXGB_MC_TBL_SIZE; i++) |
463 | IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0); | 463 | IXGB_WRITE_REG_ARRAY(hw, MTA, i, 0); |
464 | } | ||
465 | 464 | ||
466 | /* Add the new addresses */ | 465 | /* Add the new addresses */ |
467 | for(i = 0; i < mc_addr_count; i++) { | 466 | for (i = 0; i < mc_addr_count; i++) { |
468 | DEBUGOUT(" Adding the multicast addresses:\n"); | 467 | DEBUGOUT(" Adding the multicast addresses:\n"); |
469 | DEBUGOUT7(" MC Addr #%d =%.2X %.2X %.2X %.2X %.2X %.2X\n", i, | 468 | DEBUGOUT7(" MC Addr #%d =%.2X %.2X %.2X %.2X %.2X %.2X\n", i, |
470 | mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad)], | 469 | mc_addr_list[i * (IXGB_ETH_LENGTH_OF_ADDRESS + pad)], |
@@ -649,7 +648,7 @@ ixgb_clear_vfta(struct ixgb_hw *hw) | |||
649 | { | 648 | { |
650 | u32 offset; | 649 | u32 offset; |
651 | 650 | ||
652 | for(offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++) | 651 | for (offset = 0; offset < IXGB_VLAN_FILTER_TBL_SIZE; offset++) |
653 | IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0); | 652 | IXGB_WRITE_REG_ARRAY(hw, VFTA, offset, 0); |
654 | return; | 653 | return; |
655 | } | 654 | } |
@@ -790,7 +789,7 @@ ixgb_read_phy_reg(struct ixgb_hw *hw, | |||
790 | ** from the CPU Write to the Ready bit assertion. | 789 | ** from the CPU Write to the Ready bit assertion. |
791 | **************************************************************/ | 790 | **************************************************************/ |
792 | 791 | ||
793 | for(i = 0; i < 10; i++) | 792 | for (i = 0; i < 10; i++) |
794 | { | 793 | { |
795 | udelay(10); | 794 | udelay(10); |
796 | 795 | ||
@@ -817,7 +816,7 @@ ixgb_read_phy_reg(struct ixgb_hw *hw, | |||
817 | ** from the CPU Write to the Ready bit assertion. | 816 | ** from the CPU Write to the Ready bit assertion. |
818 | **************************************************************/ | 817 | **************************************************************/ |
819 | 818 | ||
820 | for(i = 0; i < 10; i++) | 819 | for (i = 0; i < 10; i++) |
821 | { | 820 | { |
822 | udelay(10); | 821 | udelay(10); |
823 | 822 | ||
@@ -886,7 +885,7 @@ ixgb_write_phy_reg(struct ixgb_hw *hw, | |||
886 | ** from the CPU Write to the Ready bit assertion. | 885 | ** from the CPU Write to the Ready bit assertion. |
887 | **************************************************************/ | 886 | **************************************************************/ |
888 | 887 | ||
889 | for(i = 0; i < 10; i++) | 888 | for (i = 0; i < 10; i++) |
890 | { | 889 | { |
891 | udelay(10); | 890 | udelay(10); |
892 | 891 | ||
@@ -913,7 +912,7 @@ ixgb_write_phy_reg(struct ixgb_hw *hw, | |||
913 | ** from the CPU Write to the Ready bit assertion. | 912 | ** from the CPU Write to the Ready bit assertion. |
914 | **************************************************************/ | 913 | **************************************************************/ |
915 | 914 | ||
916 | for(i = 0; i < 10; i++) | 915 | for (i = 0; i < 10; i++) |
917 | { | 916 | { |
918 | udelay(10); | 917 | udelay(10); |
919 | 918 | ||
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 796f01109d74..c1dde795a837 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -398,7 +398,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
398 | goto err_ioremap; | 398 | goto err_ioremap; |
399 | } | 399 | } |
400 | 400 | ||
401 | for(i = BAR_1; i <= BAR_5; i++) { | 401 | for (i = BAR_1; i <= BAR_5; i++) { |
402 | if (pci_resource_len(pdev, i) == 0) | 402 | if (pci_resource_len(pdev, i) == 0) |
403 | continue; | 403 | continue; |
404 | if (pci_resource_flags(pdev, i) & IORESOURCE_IO) { | 404 | if (pci_resource_flags(pdev, i) & IORESOURCE_IO) { |
@@ -923,7 +923,7 @@ ixgb_clean_tx_ring(struct ixgb_adapter *adapter) | |||
923 | 923 | ||
924 | /* Free all the Tx ring sk_buffs */ | 924 | /* Free all the Tx ring sk_buffs */ |
925 | 925 | ||
926 | for(i = 0; i < tx_ring->count; i++) { | 926 | for (i = 0; i < tx_ring->count; i++) { |
927 | buffer_info = &tx_ring->buffer_info[i]; | 927 | buffer_info = &tx_ring->buffer_info[i]; |
928 | ixgb_unmap_and_free_tx_resource(adapter, buffer_info); | 928 | ixgb_unmap_and_free_tx_resource(adapter, buffer_info); |
929 | } | 929 | } |
@@ -981,7 +981,7 @@ ixgb_clean_rx_ring(struct ixgb_adapter *adapter) | |||
981 | 981 | ||
982 | /* Free all the Rx ring sk_buffs */ | 982 | /* Free all the Rx ring sk_buffs */ |
983 | 983 | ||
984 | for(i = 0; i < rx_ring->count; i++) { | 984 | for (i = 0; i < rx_ring->count; i++) { |
985 | buffer_info = &rx_ring->buffer_info[i]; | 985 | buffer_info = &rx_ring->buffer_info[i]; |
986 | if (buffer_info->skb) { | 986 | if (buffer_info->skb) { |
987 | 987 | ||
@@ -1298,7 +1298,7 @@ ixgb_tx_map(struct ixgb_adapter *adapter, struct sk_buff *skb, | |||
1298 | if (++i == tx_ring->count) i = 0; | 1298 | if (++i == tx_ring->count) i = 0; |
1299 | } | 1299 | } |
1300 | 1300 | ||
1301 | for(f = 0; f < nr_frags; f++) { | 1301 | for (f = 0; f < nr_frags; f++) { |
1302 | struct skb_frag_struct *frag; | 1302 | struct skb_frag_struct *frag; |
1303 | 1303 | ||
1304 | frag = &skb_shinfo(skb)->frags[f]; | 1304 | frag = &skb_shinfo(skb)->frags[f]; |
@@ -1727,7 +1727,7 @@ ixgb_intr(int irq, void *data) | |||
1727 | * every pass through this for loop checks both receive and | 1727 | * every pass through this for loop checks both receive and |
1728 | * transmit queues for completed descriptors, intended to | 1728 | * transmit queues for completed descriptors, intended to |
1729 | * avoid starvation issues and assist tx/rx fairness. */ | 1729 | * avoid starvation issues and assist tx/rx fairness. */ |
1730 | for(i = 0; i < IXGB_MAX_INTR; i++) | 1730 | for (i = 0; i < IXGB_MAX_INTR; i++) |
1731 | if (!ixgb_clean_rx_irq(adapter) & | 1731 | if (!ixgb_clean_rx_irq(adapter) & |
1732 | !ixgb_clean_tx_irq(adapter)) | 1732 | !ixgb_clean_tx_irq(adapter)) |
1733 | break; | 1733 | break; |
@@ -2196,7 +2196,7 @@ ixgb_restore_vlan(struct ixgb_adapter *adapter) | |||
2196 | 2196 | ||
2197 | if (adapter->vlgrp) { | 2197 | if (adapter->vlgrp) { |
2198 | u16 vid; | 2198 | u16 vid; |
2199 | for(vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) { | 2199 | for (vid = 0; vid < VLAN_GROUP_ARRAY_LEN; vid++) { |
2200 | if (!vlan_group_get_device(adapter->vlgrp, vid)) | 2200 | if (!vlan_group_get_device(adapter->vlgrp, vid)) |
2201 | continue; | 2201 | continue; |
2202 | ixgb_vlan_rx_add_vid(adapter->netdev, vid); | 2202 | ixgb_vlan_rx_add_vid(adapter->netdev, vid); |
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c index 07a6980c7d8f..107ef4826b5d 100644 --- a/drivers/net/ixgb/ixgb_param.c +++ b/drivers/net/ixgb/ixgb_param.c | |||
@@ -226,7 +226,7 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) | |||
226 | int i; | 226 | int i; |
227 | struct ixgb_opt_list *ent; | 227 | struct ixgb_opt_list *ent; |
228 | 228 | ||
229 | for(i = 0; i < opt->arg.l.nr; i++) { | 229 | for (i = 0; i < opt->arg.l.nr; i++) { |
230 | ent = &opt->arg.l.p[i]; | 230 | ent = &opt->arg.l.p[i]; |
231 | if (*value == ent->i) { | 231 | if (*value == ent->i) { |
232 | if (ent->str[0] != '\0') | 232 | if (ent->str[0] != '\0') |