aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-04-25 08:42:49 -0400
committerDavid S. Miller <davem@davemloft.net>2011-04-26 03:07:03 -0400
commitbea8a63b27eb8e705a957938aadeb975178c5ea6 (patch)
treeb5e157c7ba63eca04dd68cd1e0dc3a5622fa2850 /drivers/net/tg3.c
parentb45aa2f6192e34a837ebdbb3548039c24440bc04 (diff)
tg3: Whitespace cleanups
This patch gets rid of some harmless whitespace errors. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Reviewed-by: Michael Chan <mchan@broadcom.com> Reviewed-by: Benjamin Li <benli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 6bc43ed172b5..696be59e6e32 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7666,8 +7666,6 @@ static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
7666 return 0; 7666 return 0;
7667} 7667}
7668 7668
7669/* 5705 needs a special version of the TSO firmware. */
7670
7671/* tp->lock is held. */ 7669/* tp->lock is held. */
7672static int tg3_load_tso_firmware(struct tg3 *tp) 7670static int tg3_load_tso_firmware(struct tg3 *tp)
7673{ 7671{
@@ -10179,7 +10177,6 @@ static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
10179 tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE; 10177 tp->tg3_flags &= ~TG3_FLAG_WOL_ENABLE;
10180 spin_unlock_bh(&tp->lock); 10178 spin_unlock_bh(&tp->lock);
10181 10179
10182
10183 return 0; 10180 return 0;
10184} 10181}
10185 10182
@@ -12925,7 +12922,7 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
12925done: 12922done:
12926 if (tp->tg3_flags & TG3_FLAG_WOL_CAP) 12923 if (tp->tg3_flags & TG3_FLAG_WOL_CAP)
12927 device_set_wakeup_enable(&tp->pdev->dev, 12924 device_set_wakeup_enable(&tp->pdev->dev,
12928 tp->tg3_flags & TG3_FLAG_WOL_ENABLE); 12925 tp->tg3_flags & TG3_FLAG_WOL_ENABLE);
12929 else 12926 else
12930 device_set_wakeup_capable(&tp->pdev->dev, false); 12927 device_set_wakeup_capable(&tp->pdev->dev, false);
12931} 12928}
@@ -13749,7 +13746,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
13749 (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) 13746 (tp->tg3_flags2 & TG3_FLG2_5780_CLASS))
13750 tp->tg3_flags2 |= TG3_FLG2_5750_PLUS; 13747 tp->tg3_flags2 |= TG3_FLG2_5750_PLUS;
13751 13748
13752
13753 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) || 13749 if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) ||
13754 (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)) 13750 (tp->tg3_flags2 & TG3_FLG2_5750_PLUS))
13755 tp->tg3_flags2 |= TG3_FLG2_5705_PLUS; 13751 tp->tg3_flags2 |= TG3_FLG2_5705_PLUS;
@@ -14034,7 +14030,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
14034 (tp->tg3_flags3 & TG3_FLG3_57765_PLUS)) 14030 (tp->tg3_flags3 & TG3_FLG3_57765_PLUS))
14035 tp->tg3_flags |= TG3_FLAG_CPMU_PRESENT; 14031 tp->tg3_flags |= TG3_FLAG_CPMU_PRESENT;
14036 14032
14037 /* Set up tp->grc_local_ctrl before calling tg_power_up(). 14033 /* Set up tp->grc_local_ctrl before calling tg3_power_up().
14038 * GPIO1 driven high will bring 5700's external PHY out of reset. 14034 * GPIO1 driven high will bring 5700's external PHY out of reset.
14039 * It is also used as eeprom write protect on LOMs. 14035 * It is also used as eeprom write protect on LOMs.
14040 */ 14036 */
@@ -14829,7 +14825,6 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
14829 } 14825 }
14830 if ((tp->dma_rwctrl & DMA_RWCTRL_WRITE_BNDRY_MASK) != 14826 if ((tp->dma_rwctrl & DMA_RWCTRL_WRITE_BNDRY_MASK) !=
14831 DMA_RWCTRL_WRITE_BNDRY_16) { 14827 DMA_RWCTRL_WRITE_BNDRY_16) {
14832
14833 /* DMA test passed without adjusting DMA boundary, 14828 /* DMA test passed without adjusting DMA boundary,
14834 * now look for chipsets that are known to expose the 14829 * now look for chipsets that are known to expose the
14835 * DMA bug without failing the test. 14830 * DMA bug without failing the test.