Commit 6ff6f81d authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Remove excessive parenthesis 



This patch removes some excessive parenthesizing.

Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0da0606f

drivers/net/tg3.c

+18 −18
Original line number Original line Diff line number Diff line
@@ -553,7 +553,7 @@ static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val) 
{

{

	unsigned long flags;

	unsigned long flags;





	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) &&

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906 &&

	    (off >= NIC_SRAM_STATS_BLK) && (off < NIC_SRAM_TX_BUFFER_DESC))

	    (off >= NIC_SRAM_STATS_BLK) && (off < NIC_SRAM_TX_BUFFER_DESC))

		return;

		return;
@@ -578,7 +578,7 @@ static void tg3_read_mem(struct tg3 *tp, u32 off, u32 *val) 
{

{

	unsigned long flags;

	unsigned long flags;





	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) &&

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906 &&

	    (off >= NIC_SRAM_STATS_BLK) && (off < NIC_SRAM_TX_BUFFER_DESC)) {

	    (off >= NIC_SRAM_STATS_BLK) && (off < NIC_SRAM_TX_BUFFER_DESC)) {

		*val = 0;

		*val = 0;

		return;

		return;
@@ -2806,7 +2806,7 @@ static int tg3_power_down_prepare(struct tg3 *tp) 
			    CLOCK_CTRL_PWRDOWN_PLL133, 40);

			    CLOCK_CTRL_PWRDOWN_PLL133, 40);

	} else if (tg3_flag(tp, 5780_CLASS) ||

	} else if (tg3_flag(tp, 5780_CLASS) ||

		   tg3_flag(tp, CPMU_PRESENT) ||

		   tg3_flag(tp, CPMU_PRESENT) ||

		   (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)) {

		   GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {

		/* do nothing */

		/* do nothing */

	} else if (!(tg3_flag(tp, 5750_PLUS) && tg3_flag(tp, ENABLE_ASF))) {

	} else if (!(tg3_flag(tp, 5750_PLUS) && tg3_flag(tp, ENABLE_ASF))) {

		u32 newbits1, newbits2;

		u32 newbits1, newbits2;
@@ -8646,7 +8646,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) 
	}

	}





	if ((tp->phy_flags & TG3_PHYFLG_MII_SERDES) &&

	if ((tp->phy_flags & TG3_PHYFLG_MII_SERDES) &&

	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) {

	    GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714) {

		u32 tmp;

		u32 tmp;





		tmp = tr32(SERDES_RX_CTRL);

		tmp = tr32(SERDES_RX_CTRL);
@@ -11636,7 +11636,7 @@ static void __devinit tg3_get_nvram_info(struct tg3 *tp) 
		tw32(NVRAM_CFG1, nvcfg1);

		tw32(NVRAM_CFG1, nvcfg1);

	}

	}





	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750) ||

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||

	    tg3_flag(tp, 5780_CLASS)) {

	    tg3_flag(tp, 5780_CLASS)) {

		switch (nvcfg1 & NVRAM_CFG1_VENDOR_MASK) {

		switch (nvcfg1 & NVRAM_CFG1_VENDOR_MASK) {

		case FLASH_VENDOR_ATMEL_FLASH_BUFFERED:

		case FLASH_VENDOR_ATMEL_FLASH_BUFFERED:
@@ -12640,9 +12640,9 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp) 




		tg3_read_mem(tp, NIC_SRAM_DATA_VER, &ver);

		tg3_read_mem(tp, NIC_SRAM_DATA_VER, &ver);

		ver >>= NIC_SRAM_DATA_VER_SHIFT;

		ver >>= NIC_SRAM_DATA_VER_SHIFT;

		if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700) &&

		if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&

		    (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) &&

		    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701 &&

		    (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5703) &&

		    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5703 &&

		    (ver > 0) && (ver < 0x100))

		    (ver > 0) && (ver < 0x100))

			tg3_read_mem(tp, NIC_SRAM_DATA_CFG_2, &cfg2);

			tg3_read_mem(tp, NIC_SRAM_DATA_CFG_2, &cfg2);
@@ -13498,7 +13498,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
		}

		}

	}

	}





	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)) {

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) {

		static struct tg3_dev_id {

		static struct tg3_dev_id {

			u32	vendor;

			u32	vendor;

			u32	device;

			u32	device;
@@ -13598,7 +13598,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	    tg3_flag(tp, 5780_CLASS))

	    tg3_flag(tp, 5780_CLASS))

		tg3_flag_set(tp, 5750_PLUS);

		tg3_flag_set(tp, 5750_PLUS);





	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) ||

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||

	    tg3_flag(tp, 5750_PLUS))

	    tg3_flag(tp, 5750_PLUS))

		tg3_flag_set(tp, 5705_PLUS);

		tg3_flag_set(tp, 5705_PLUS);
@@ -13627,9 +13627,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	}

	}





	/* Selectively allow TSO based on operating conditions */

	/* Selectively allow TSO based on operating conditions */

	if ((tg3_flag(tp, HW_TSO_1) ||

	if (tg3_flag(tp, HW_TSO_1) ||

	    tg3_flag(tp, HW_TSO_2) ||

	    tg3_flag(tp, HW_TSO_2) ||

	     tg3_flag(tp, HW_TSO_3)) ||

	    tg3_flag(tp, HW_TSO_3) ||

	    (tp->fw_needed && !tg3_flag(tp, ENABLE_ASF)))

	    (tp->fw_needed && !tg3_flag(tp, ENABLE_ASF)))

		tg3_flag_set(tp, TSO_CAPABLE);

		tg3_flag_set(tp, TSO_CAPABLE);

	else {

	else {
@@ -13891,7 +13891,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
	 * It is also used as eeprom write protect on LOMs.

	 * It is also used as eeprom write protect on LOMs.

	 */

	 */

	tp->grc_local_ctrl = GRC_LCLCTRL_INT_ON_ATTN | GRC_LCLCTRL_AUTO_SEEPROM;

	tp->grc_local_ctrl = GRC_LCLCTRL_INT_ON_ATTN | GRC_LCLCTRL_AUTO_SEEPROM;

	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) ||

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||

	    tg3_flag(tp, EEPROM_WRITE_PROT))

	    tg3_flag(tp, EEPROM_WRITE_PROT))

		tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |

		tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |

				       GRC_LCLCTRL_GPIO_OUTPUT1);

				       GRC_LCLCTRL_GPIO_OUTPUT1);
@@ -13943,8 +13943,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
		tp->phy_flags |= TG3_PHYFLG_IS_FET;

		tp->phy_flags |= TG3_PHYFLG_IS_FET;





	/* A few boards don't want Ethernet@WireSpeed phy feature */

	/* A few boards don't want Ethernet@WireSpeed phy feature */

	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) ||

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 ||

	    ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&

	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&

	     (tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) &&

	     (tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) &&

	     (tp->pci_chip_rev_id != CHIPREV_ID_5705_A1)) ||

	     (tp->pci_chip_rev_id != CHIPREV_ID_5705_A1)) ||

	    (tp->phy_flags & TG3_PHYFLG_IS_FET) ||

	    (tp->phy_flags & TG3_PHYFLG_IS_FET) ||
@@ -14064,7 +14064,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) 
		tg3_flag_set(tp, IS_5788);

		tg3_flag_set(tp, IS_5788);





	if (!tg3_flag(tp, IS_5788) &&

	if (!tg3_flag(tp, IS_5788) &&

	    (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700))

	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700)

		tg3_flag_set(tp, TAGGED_STATUS);

		tg3_flag_set(tp, TAGGED_STATUS);

	if (tg3_flag(tp, TAGGED_STATUS)) {

	if (tg3_flag(tp, TAGGED_STATUS)) {

		tp->coalesce_mode |= (HOSTCC_MODE_CLRTICK_RXBD |

		tp->coalesce_mode |= (HOSTCC_MODE_CLRTICK_RXBD |
@@ -14215,7 +14215,7 @@ static int __devinit tg3_get_device_address(struct tg3 *tp) 
#endif

#endif





	mac_offset = 0x7c;

	mac_offset = 0x7c;

	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 ||

	    tg3_flag(tp, 5780_CLASS)) {

	    tg3_flag(tp, 5780_CLASS)) {

		if (tr32(TG3PCI_DUAL_MAC_CTRL) & DUAL_MAC_CTRL_ID)

		if (tr32(TG3PCI_DUAL_MAC_CTRL) & DUAL_MAC_CTRL_ID)

			mac_offset = 0xcc;

			mac_offset = 0xcc;