net: amd8111e: remove redundant duplicated if statement

There are two identical nested if statements, the second is redundant
and can be removed. Also clean up white space formatting.

Cleans up cppcheck warning:
drivers/net/ethernet/amd/amd8111e.c:1080: (warning) Identical inner 'if'
condition is always true.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amd/amd8111e.c b/drivers/net/ethernet/amd/amd8111e.c
index c99e3e8..a90080f 100644 (file)
--- a/drivers/net/ethernet/amd/amd8111e.c
+++ b/drivers/net/ethernet/amd/amd8111e.c
@@ -1074,16 +1074,12 @@ static int amd8111e_calc_coalesce(struct net_device *dev)
                                amd8111e_set_coalesce(dev,TX_INTR_COAL);
                                coal_conf->tx_coal_type = MEDIUM_COALESCE;
                        }
-
-               }
-               else if(tx_pkt_size >= 1024){
-                       if (tx_pkt_size >= 1024){
-                               if(coal_conf->tx_coal_type !=  HIGH_COALESCE){
-                                       coal_conf->tx_timeout = 4;
-                                       coal_conf->tx_event_count = 8;
-                                       amd8111e_set_coalesce(dev,TX_INTR_COAL);
-                                       coal_conf->tx_coal_type = HIGH_COALESCE;
-                               }
+               } else if (tx_pkt_size >= 1024) {
+                       if (coal_conf->tx_coal_type != HIGH_COALESCE) {
+                               coal_conf->tx_timeout = 4;
+                               coal_conf->tx_event_count = 8;
+                               amd8111e_set_coalesce(dev, TX_INTR_COAL);
+                               coal_conf->tx_coal_type = HIGH_COALESCE;
                        }
                }
        }