e1000e: remove unnecessary parentheses

(cherry picked from commit 668018d74762741c3fe5a54f0eea1bd65dcabd7e)
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>
Signed-off-by: Joe Jin <joe.jin@oracle.com>

diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
index 27c57a3f832d65cbdba9c93ec861df9c6daceeaf..b0d3dcca5da211d728ae9bc30af7d5c0634f5cba 100644 (file)
--- a/drivers/net/e1000e/82571.c
+++ b/drivers/net/e1000e/82571.c
@@ -1865,7 +1865,7 @@ static void e1000_power_down_phy_copper_82571(struct e1000_hw *hw)
        struct e1000_phy_info *phy = &hw->phy;
        struct e1000_mac_info *mac = &hw->mac;
 
-       if (!(phy->ops.check_reset_block))
+       if (!phy->ops.check_reset_block)
                return;
 
        /* If the management interface is not enabled, then power down */

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 5686573a05f6b367ce602f8fc2373a3d9f3af6cb..5ad08c70be9c546ea7de5f1bb6249c7106c43364 100644 (file)
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -1090,7 +1090,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
        tx_ring->buffer_info = kcalloc(tx_ring->count,
                                       sizeof(struct e1000_buffer),
                                       GFP_KERNEL);
-       if (!(tx_ring->buffer_info)) {
+       if (!tx_ring->buffer_info) {
                ret_val = 1;
                goto err_nomem;
        }
@@ -1152,7 +1152,7 @@ static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
        rx_ring->buffer_info = kcalloc(rx_ring->count,
                                       sizeof(struct e1000_buffer),
                                       GFP_KERNEL);
-       if (!(rx_ring->buffer_info)) {
+       if (!rx_ring->buffer_info) {
                ret_val = 5;
                goto err_nomem;
        }

diff --git a/drivers/net/e1000e/mac.c b/drivers/net/e1000e/mac.c
index be8335aead5ec06ce15b18082fea0f08d667b404..0d63c3e1971d51c7a065454a891341276ce4f745 100644 (file)
--- a/drivers/net/e1000e/mac.c
+++ b/drivers/net/e1000e/mac.c
@@ -511,8 +511,8 @@ s32 e1000e_check_for_fiber_link(struct e1000_hw *hw)
         * was just plugged in. The autoneg_failed flag does this.
         */
        /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((ctrl & E1000_CTRL_SWDPIN1) && (!(status & E1000_STATUS_LU)) &&
-           (!(rxcw & E1000_RXCW_C))) {
+       if ((ctrl & E1000_CTRL_SWDPIN1) && !(status & E1000_STATUS_LU) &&
+           !(rxcw & E1000_RXCW_C)) {
                if (mac->autoneg_failed == 0) {
                        mac->autoneg_failed = 1;
                        return 0;
@@ -577,7 +577,7 @@ s32 e1000e_check_for_serdes_link(struct e1000_hw *hw)
         * time to complete.
         */
        /* (ctrl & E1000_CTRL_SWDPIN1) == 1 == have signal */
-       if ((!(status & E1000_STATUS_LU)) && (!(rxcw & E1000_RXCW_C))) {
+       if (!(status & E1000_STATUS_LU) && !(rxcw & E1000_RXCW_C)) {
                if (mac->autoneg_failed == 0) {
                        mac->autoneg_failed = 1;
                        return 0;

diff --git a/drivers/net/e1000e/manage.c b/drivers/net/e1000e/manage.c
index 6594dbf248b4e9c445abbcb185e5a6f519527532..c54caf6e5801059fd771b664c1de33dfc02b3349 100644 (file)
--- a/drivers/net/e1000e/manage.c
+++ b/drivers/net/e1000e/manage.c
@@ -78,7 +78,7 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw)
        u32 hicr;
        u8 i;
 
-       if (!(hw->mac.arc_subsystem_valid)) {
+       if (!hw->mac.arc_subsystem_valid) {
                e_dbg("ARC subsystem not valid.\n");
                return -E1000_ERR_HOST_INTERFACE_COMMAND;
        }

diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index 8dd2ff03f1f7f6b50dcb0df5e3e29db36c0838c6..e8ad0804702fea090bc5fc6407d1b7d8e109f423 100644 (file)
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -132,7 +132,7 @@ s32 e1000e_get_phy_id(struct e1000_hw *hw)
        u16 phy_id;
        u16 retry_count = 0;
 
-       if (!(phy->ops.read_reg))
+       if (!phy->ops.read_reg)
                goto out;
 
        while (retry_count < 2) {
@@ -382,7 +382,7 @@ static s32 __e1000e_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data,
        s32 ret_val = 0;
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
+               if (!hw->phy.ops.acquire)
                        goto out;
 
                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,
        s32 ret_val = 0;
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
+               if (!hw->phy.ops.acquire)
                        goto out;
 
                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,
        s32 ret_val = 0;
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
+               if (!hw->phy.ops.acquire)
                        goto out;
 
                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,
        s32 ret_val = 0;
 
        if (!locked) {
-               if (!(hw->phy.ops.acquire))
+               if (!hw->phy.ops.acquire)
                        goto out;
 
                ret_val = hw->phy.ops.acquire(hw);