1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index ec7b77fea98b..fe50242aa9e6 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -1806,9 +1806,8 @@ void e1000e_set_interrupt_capability(struct e1000_adapter *adapter)
                                 err = pci_enable_msix(adapter->pdev,
                                                       adapter->msix_entries,
                                                       adapter->num_vectors);
-                                if (err == 0) {
+                                if (err == 0)
                                         return;
-                                }
                         }
                         /* MSI-X failed, so fall through and try MSI */
                         e_err("Failed to initialize MSI-X interrupts.  "
@@ -2198,9 +2197,8 @@ void e1000e_free_rx_resources(struct e1000_adapter *adapter)
 
         e1000_clean_rx_ring(adapter);
 
-        for (i = 0; i < rx_ring->count; i++) {
+        for (i = 0; i < rx_ring->count; i++)
                 kfree(rx_ring->buffer_info[i].ps_pages);
-        }
 
         vfree(rx_ring->buffer_info);
         rx_ring->buffer_info = NULL;
@@ -2240,20 +2238,18 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
                 /* handle TSO and jumbo frames */
                 if (bytes/packets > 8000)
                         retval = bulk_latency;
-                else if ((packets < 5) && (bytes > 512)) {
+                else if ((packets < 5) && (bytes > 512))
                         retval = low_latency;
-                }
                 break;
         case low_latency:  /* 50 usec aka 20000 ints/s */
                 if (bytes > 10000) {
                         /* this if handles the TSO accounting */
-                        if (bytes/packets > 8000) {
+                        if (bytes/packets > 8000)
                                 retval = bulk_latency;
-                        } else if ((packets < 10) || ((bytes/packets) > 1200)) {
+                        else if ((packets < 10) || ((bytes/packets) > 1200))
                                 retval = bulk_latency;
-                        } else if ((packets > 35)) {
+                        else if ((packets > 35))
                                 retval = lowest_latency;
-                        }
                 } else if (bytes/packets > 2000) {
                         retval = bulk_latency;
                 } else if (packets <= 2 && bytes < 512) {
@@ -2262,9 +2258,8 @@ static unsigned int e1000_update_itr(struct e1000_adapter *adapter,
                 break;
         case bulk_latency: /* 250 usec aka 4000 ints/s */
                 if (bytes > 25000) {
-                        if (packets > 35) {
+                        if (packets > 35)
                                 retval = low_latency;
-                        }
                 } else if (bytes < 6000) {
                         retval = low_latency;
                 }