aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-01-31 02:02:56 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-02-10 03:06:44 -0500
commit668018d74762741c3fe5a54f0eea1bd65dcabd7e (patch)
tree570216ff40d826144d618817f607c19432b41c0d /drivers
parentfe1e980f24697edb7d4e17cd74bbeae4a0388525 (diff)
e1000e: remove unnecessary parentheses
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/ethtool.c4
-rw-r--r--drivers/net/ethernet/intel/e1000e/mac.c6
-rw-r--r--drivers/net/ethernet/intel/e1000e/manage.c2
-rw-r--r--drivers/net/ethernet/intel/e1000e/phy.c10
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 4cadcc76ad58..7ef4711a32b8 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -1865,7 +1865,7 @@ static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw)
1865 struct e1000_phy_info *phy = &hw->phy; 1865 struct e1000_phy_info *phy = &hw->phy;
1866 struct e1000_mac_info *mac = &hw->mac; 1866 struct e1000_mac_info *mac = &hw->mac;
1867 1867
1868 if (!(phy->ops.check_reset_block)) 1868 if (!phy->ops.check_reset_block)
1869 return; 1869 return;
1870 1870
1871 /* If the management interface is not enabled, then power down */ 1871 /* If the management interface is not enabled, then power down */
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c
index f4dc0fa9d9b5..b1f5d7491b57 100644
--- a/drivers/net/ethernet/intel/e1000e/ethtool.c
+++ b/drivers/net/ethernet/intel/e1000e/ethtool.c
@@ -1088,7 +1088,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
1088 tx_ring->buffer_info = kcalloc(tx_ring->count, 1088 tx_ring->buffer_info = kcalloc(tx_ring->count,
1089 sizeof(struct e1000_buffer), 1089 sizeof(struct e1000_buffer),
1090 GFP_KERNEL); 1090 GFP_KERNEL);
1091 if (!(tx_ring->buffer_info)) { 1091 if (!tx_ring->buffer_info) {
1092 ret_val = 1; 1092 ret_val = 1;
1093 goto err_nomem; 1093 goto err_nomem;
1094 } 1094 }
@@ -1150,7 +1150,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
1150 rx_ring->buffer_info = kcalloc(rx_ring->count, 1150 rx_ring->buffer_info = kcalloc(rx_ring->count,
1151 sizeof(struct e1000_buffer), 1151 sizeof(struct e1000_buffer),
1152 GFP_KERNEL); 1152 GFP_KERNEL);
1153 if (!(rx_ring->buffer_info)) { 1153 if (!rx_ring->buffer_info) {
1154 ret_val = 5; 1154 ret_val = 5;
1155 goto err_nomem; 1155 goto err_nomem;
1156 } 1156 }
diff --git a/drivers/net/ethernet/intel/e1000e/mac.c b/drivers/net/ethernet/intel/e1000e/mac.c
index be8335aead5e..0d63c3e1971d 100644
--- a/drivers/net/ethernet/intel/e1000e/mac.c
+++ b/drivers/net/ethernet/intel/e1000e/mac.c
@@ -511,8 +511,8 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
511 * was just plugged in. The autoneg_failed flag does this. 511 * was just plugged in. The autoneg_failed flag does this.
512 */ 512 */
513 /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */ 513 /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
514 if ((ctrl & E1000_CTRL_SWDPIN1) && (!(status & E1000_STATUS_LU)) && 514 if ((ctrl & E1000_CTRL_SWDPIN1) && !(status & E1000_STATUS_LU) &&
515 (!(rxcw & E1000_RXCW_C))) { 515 !(rxcw & E1000_RXCW_C)) {
516 if (mac->autoneg_failed == 0) { 516 if (mac->autoneg_failed == 0) {
517 mac->autoneg_failed = 1; 517 mac->autoneg_failed = 1;
518 return 0; 518 return 0;
@@ -577,7 +577,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
577 * time to complete. 577 * time to complete.
578 */ 578 */
579 /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */ 579 /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
580 if ((!(status & E1000_STATUS_LU)) && (!(rxcw & E1000_RXCW_C))) { 580 if (!(status & E1000_STATUS_LU) && !(rxcw & E1000_RXCW_C)) {
581 if (mac->autoneg_failed == 0) { 581 if (mac->autoneg_failed == 0) {
582 mac->autoneg_failed = 1; 582 mac->autoneg_failed = 1;
583 return 0; 583 return 0;
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c
index 6594dbf248b4..c54caf6e5801 100644
--- a/drivers/net/ethernet/intel/e1000e/manage.c
+++ b/drivers/net/ethernet/intel/e1000e/manage.c
@@ -78,7 +78,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
78 u32 hicr; 78 u32 hicr;
79 u8 i; 79 u8 i;
80 80
81 if (!(hw->mac.arc_subsystem_valid)) { 81 if (!hw->mac.arc_subsystem_valid) {
82 e_dbg("ARC subsystem not valid.\n"); 82 e_dbg("ARC subsystem not valid.\n");
83 return -E1000_ERR_HOST_INTERFACE_COMMAND; 83 return -E1000_ERR_HOST_INTERFACE_COMMAND;
84 } 84 }
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index 8dd2ff03f1f7..e8ad0804702f 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -132,7 +132,7 @@ s32 e1000e_get_phy_id(struct e1000_hw *hw)
132 u16 phy_id; 132 u16 phy_id;
133 u16 retry_count = 0; 133 u16 retry_count = 0;
134 134
135 if (!(phy->ops.read_reg)) 135 if (!phy->ops.read_reg)
136 goto out; 136 goto out;
137 137
138 while (retry_count < 2) { 138 while (retry_count < 2) {
@@ -382,7 +382,7 @@ static s32 __e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
382 s32 ret_val = 0; 382 s32 ret_val = 0;
383 383
384 if (!locked) { 384 if (!locked) {
385 if (!(hw->phy.ops.acquire)) 385 if (!hw->phy.ops.acquire)
386 goto out; 386 goto out;
387 387
388 ret_val = hw->phy.ops.acquire(hw); 388 ret_val = hw->phy.ops.acquire(hw);
@@ -453,7 +453,7 @@ static s32 __e1000e_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data,
453 s32 ret_val = 0; 453 s32 ret_val = 0;
454 454
455 if (!locked) { 455 if (!locked) {
456 if (!(hw->phy.ops.acquire)) 456 if (!hw->phy.ops.acquire)
457 goto out; 457 goto out;
458 458
459 ret_val = hw->phy.ops.acquire(hw); 459 ret_val = hw->phy.ops.acquire(hw);
@@ -526,7 +526,7 @@ static s32 __e1000_read_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 *data,
526 s32 ret_val = 0; 526 s32 ret_val = 0;
527 527
528 if (!locked) { 528 if (!locked) {
529 if (!(hw->phy.ops.acquire)) 529 if (!hw->phy.ops.acquire)
530 goto out; 530 goto out;
531 531
532 ret_val = hw->phy.ops.acquire(hw); 532 ret_val = hw->phy.ops.acquire(hw);
@@ -599,7 +599,7 @@ static s32 __e1000_write_kmrn_reg(struct e1000_hw *hw, u32 offset, u16 data,
599 s32 ret_val = 0; 599 s32 ret_val = 0;
600 600
601 if (!locked) { 601 if (!locked) {
602 if (!(hw->phy.ops.acquire)) 602 if (!hw->phy.ops.acquire)
603 goto out; 603 goto out;
604 604
605 ret_val = hw->phy.ops.acquire(hw); 605 ret_val = hw->phy.ops.acquire(hw);