1 files changed, 36 insertions, 44 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index a177b8b65c44..e8192d3f7eb4 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -850,8 +850,8 @@ check_page:
 
                 if (!buffer_info->dma)
                         buffer_info->dma = dma_map_page(&pdev->dev,
-                                                        buffer_info->page, 0,
-                                                        PAGE_SIZE,
+                                                        buffer_info->page, 0,
+                                                        PAGE_SIZE,
                                                         DMA_FROM_DEVICE);
 
                 rx_desc = E1000_RX_DESC_EXT(*rx_ring, i);
@@ -1068,8 +1068,8 @@ static void e1000_put_txbuf(struct e1000_ring *tx_ring,
 static void e1000_print_hw_hang(struct work_struct *work)
 {
         struct e1000_adapter *adapter = container_of(work,
-                                                     struct e1000_adapter,
-                                                     print_hang_task);
+                                                     struct e1000_adapter,
+                                                     print_hang_task);
         struct net_device *netdev = adapter->netdev;
         struct e1000_ring *tx_ring = adapter->tx_ring;
         unsigned int i = tx_ring->next_to_clean;
@@ -1549,7 +1549,7 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                                 /* this is the beginning of a chain */
                                 rxtop = skb;
                                 skb_fill_page_desc(rxtop, 0, buffer_info->page,
-                                                   0, length);
+                                                   0, length);
                         } else {
                                 /* this is the middle of a chain */
                                 skb_fill_page_desc(rxtop,
@@ -1590,10 +1590,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_ring *rx_ring, int *work_done,
                                         skb_put(skb, length);
                                 } else {
                                         skb_fill_page_desc(skb, 0,
-                                                           buffer_info->page, 0,
-                                                           length);
+                                                           buffer_info->page, 0,
+                                                           length);
                                         e1000_consume_page(buffer_info, skb,
-                                                           length);
+                                                           length);
                                 }
                         }
                 }
@@ -1666,8 +1666,7 @@ static void e1000_clean_rx_ring(struct e1000_ring *rx_ring)
                                                  DMA_FROM_DEVICE);
                         else if (adapter->clean_rx == e1000_clean_jumbo_rx_irq)
                                 dma_unmap_page(&pdev->dev, buffer_info->dma,
-                                               PAGE_SIZE,
-                                               DMA_FROM_DEVICE);
+                                               PAGE_SIZE, DMA_FROM_DEVICE);
                         else if (adapter->clean_rx == e1000_clean_rx_irq_ps)
                                 dma_unmap_single(&pdev->dev, buffer_info->dma,
                                                  adapter->rx_ps_bsize0,
@@ -2578,8 +2577,7 @@ set_itr_now:
                  * increasing
                  */
                 new_itr = new_itr > adapter->itr ?
-                             min(adapter->itr + (new_itr >> 2), new_itr) :
-                             new_itr;
+                    min(adapter->itr + (new_itr >> 2), new_itr) : new_itr;
                 adapter->itr = new_itr;
                 adapter->rx_ring->itr_val = new_itr;
                 if (adapter->msix_entries)
@@ -2827,7 +2825,7 @@ static void e1000_restore_vlan(struct e1000_adapter *adapter)
         e1000_vlan_rx_add_vid(adapter->netdev, 0);
 
         for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
-                e1000_vlan_rx_add_vid(adapter->netdev, vid);
+            e1000_vlan_rx_add_vid(adapter->netdev, vid);
 }
 
 static void e1000_init_manageability_pt(struct e1000_adapter *adapter)
@@ -3002,8 +3000,8 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         rctl = er32(RCTL);
         rctl &= ~(3 << E1000_RCTL_MO_SHIFT);
         rctl |= E1000_RCTL_EN | E1000_RCTL_BAM |
-                E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
-                (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
+            E1000_RCTL_LBM_NO | E1000_RCTL_RDMTS_HALF |
+            (adapter->hw.mac.mc_filter_type << E1000_RCTL_MO_SHIFT);
 
         /* Do not Store bad packets */
         rctl &= ~E1000_RCTL_SBP;
@@ -3275,7 +3273,7 @@ static int e1000e_write_mc_addr_list(struct net_device *netdev)
         /* update_mc_addr_list expects a packed array of only addresses. */
         i = 0;
         netdev_for_each_mc_addr(ha, netdev)
-                memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
+            memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN);
 
         hw->mac.ops.update_mc_addr_list(hw, mta_list, i);
         kfree(mta_list);
@@ -4615,18 +4613,16 @@ static void e1000e_update_stats(struct e1000_adapter *adapter)
          * our own version based on RUC and ROC
          */
         netdev->stats.rx_errors = adapter->stats.rxerrc +
-                adapter->stats.crcerrs + adapter->stats.algnerrc +
-                adapter->stats.ruc + adapter->stats.roc +
-                adapter->stats.cexterr;
+            adapter->stats.crcerrs + adapter->stats.algnerrc +
+            adapter->stats.ruc + adapter->stats.roc + adapter->stats.cexterr;
         netdev->stats.rx_length_errors = adapter->stats.ruc +
-                                              adapter->stats.roc;
+            adapter->stats.roc;
         netdev->stats.rx_crc_errors = adapter->stats.crcerrs;
         netdev->stats.rx_frame_errors = adapter->stats.algnerrc;
         netdev->stats.rx_missed_errors = adapter->stats.mpc;
 
         /* Tx Errors */
-        netdev->stats.tx_errors = adapter->stats.ecol +
-                                       adapter->stats.latecol;
+        netdev->stats.tx_errors = adapter->stats.ecol + adapter->stats.latecol;
         netdev->stats.tx_aborted_errors = adapter->stats.ecol;
         netdev->stats.tx_window_errors = adapter->stats.latecol;
         netdev->stats.tx_carrier_errors = adapter->stats.tncrs;
@@ -5056,14 +5052,14 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
                 iph->tot_len = 0;
                 iph->check = 0;
                 tcp_hdr(skb)->check = ~csum_tcpudp_magic(iph->saddr, iph->daddr,
-                                                         0, IPPROTO_TCP, 0);
+                                                         0, IPPROTO_TCP, 0);
                 cmd_length = E1000_TXD_CMD_IP;
                 ipcse = skb_transport_offset(skb) - 1;
         } else if (skb_is_gso_v6(skb)) {
                 ipv6_hdr(skb)->payload_len = 0;
                 tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
-                                                       &ipv6_hdr(skb)->daddr,
-                                                       0, IPPROTO_TCP, 0);
+                                                       &ipv6_hdr(skb)->daddr,
+                                                       0, IPPROTO_TCP, 0);
                 ipcse = 0;
         }
         ipcss = skb_network_offset(skb);
@@ -5072,7 +5068,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
         tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
 
         cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
-                       E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
+                       E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
 
         i = tx_ring->next_to_use;
         context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
@@ -5142,8 +5138,7 @@ static bool e1000_tx_csum(struct e1000_ring *tx_ring, struct sk_buff *skb)
 
         context_desc->lower_setup.ip_config = 0;
         context_desc->upper_setup.tcp_fields.tucss = css;
-        context_desc->upper_setup.tcp_fields.tucso =
-                                css + skb->csum_offset;
+        context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;
         context_desc->upper_setup.tcp_fields.tucse = 0;
         context_desc->tcp_seg_setup.data = 0;
         context_desc->cmd_and_length = cpu_to_le32(cmd_len);
@@ -5265,7 +5260,7 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
 
         if (tx_flags & E1000_TX_FLAGS_TSO) {
                 txd_lower |= E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D |
-                             E1000_TXD_CMD_TSE;
+                    E1000_TXD_CMD_TSE;
                 txd_upper |= E1000_TXD_POPTS_TXSM << 8;
 
                 if (tx_flags & E1000_TX_FLAGS_IPV4)
@@ -5296,8 +5291,8 @@ static void e1000_tx_queue(struct e1000_ring *tx_ring, int tx_flags, int count)
                 buffer_info = &tx_ring->buffer_info[i];
                 tx_desc = E1000_TX_DESC(*tx_ring, i);
                 tx_desc->buffer_addr = cpu_to_le64(buffer_info->dma);
-                tx_desc->lower.data =
-                        cpu_to_le32(txd_lower | buffer_info->length);
+                tx_desc->lower.data = cpu_to_le32(txd_lower |
+                                                  buffer_info->length);
                 tx_desc->upper.data = cpu_to_le32(txd_upper);
 
                 i++;
@@ -5597,18 +5592,15 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
          * our own version based on RUC and ROC
          */
         stats->rx_errors = adapter->stats.rxerrc +
-                adapter->stats.crcerrs + adapter->stats.algnerrc +
-                adapter->stats.ruc + adapter->stats.roc +
-                adapter->stats.cexterr;
-        stats->rx_length_errors = adapter->stats.ruc +
-                                              adapter->stats.roc;
+            adapter->stats.crcerrs + adapter->stats.algnerrc +
+            adapter->stats.ruc + adapter->stats.roc + adapter->stats.cexterr;
+        stats->rx_length_errors = adapter->stats.ruc + adapter->stats.roc;
         stats->rx_crc_errors = adapter->stats.crcerrs;
         stats->rx_frame_errors = adapter->stats.algnerrc;
         stats->rx_missed_errors = adapter->stats.mpc;
 
         /* Tx Errors */
-        stats->tx_errors = adapter->stats.ecol +
-                                       adapter->stats.latecol;
+        stats->tx_errors = adapter->stats.ecol + adapter->stats.latecol;
         stats->tx_aborted_errors = adapter->stats.ecol;
         stats->tx_window_errors = adapter->stats.latecol;
         stats->tx_carrier_errors = adapter->stats.tncrs;
@@ -6002,8 +5994,7 @@ static void e1000_power_off(struct pci_dev *pdev, bool sleep, bool wake)
         pci_set_power_state(pdev, PCI_D3hot);
 }
 
-static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep,
-                                    bool wake)
+static void e1000_complete_shutdown(struct pci_dev *pdev, bool sleep, bool wake)
 {
         struct net_device *netdev = pci_get_drvdata(pdev);
         struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -6413,7 +6404,7 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
         e_info("(PCI Express:2.5GT/s:%s) %pM\n",
                /* bus width */
                ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
-                "Width x1"),
+                "Width x1"),
                /* MAC address */
                netdev->dev_addr);
         e_info("Intel(R) PRO/%s Network Connection\n",
@@ -6550,7 +6541,8 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         err = dma_set_coherent_mask(&pdev->dev,
                                                     DMA_BIT_MASK(32));
                         if (err) {
-                                dev_err(&pdev->dev, "No usable DMA configuration, aborting\n");
+                                dev_err(&pdev->dev,
+                                        "No usable DMA configuration, aborting\n");
                                 goto err_dma;
                         }
                 }
@@ -6835,7 +6827,7 @@ err_ioremap:
         free_netdev(netdev);
 err_alloc_etherdev:
         pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+                                     pci_select_bars(pdev, IORESOURCE_MEM));
 err_pci_reg:
 err_dma:
         pci_disable_device(pdev);
@@ -6905,7 +6897,7 @@ static void e1000_remove(struct pci_dev *pdev)
         if (adapter->hw.flash_address)
                 iounmap(adapter->hw.flash_address);
         pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+                                     pci_select_bars(pdev, IORESOURCE_MEM));
 
         free_netdev(netdev);