e1000e: minor whitespace and indentation cleanup

Cleanup of some whitespace and indentation of a single code block.

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>

2 files changed, 43 insertions, 37 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
index 0e64cc438494..5061d4ded6e2 100644
--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
@@ -280,8 +280,8 @@ static inline void __ew32flash(struct e1000_hw *hw, unsigned long reg, u32 val)
 
 #define er16flash(reg)          __er16flash(hw, (reg))
 #define er32flash(reg)          __er32flash(hw, (reg))
-#define ew16flash(reg,val)      __ew16flash(hw, (reg), (val))
-#define ew32flash(reg,val)      __ew32flash(hw, (reg), (val))
+#define ew16flash(reg, val)     __ew16flash(hw, (reg), (val))
+#define ew32flash(reg, val)     __ew32flash(hw, (reg), (val))
 
 static void e1000_toggle_lanphypc_value_ich8lan(struct e1000_hw *hw)
 {
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 2ac1164d04e5..293a7606e0f4 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -1267,43 +1267,49 @@ static bool e1000_clean_rx_irq_ps(struct e1000_ring *rx_ring, int *work_done,
                 skb_put(skb, length);
 
                 {
-                /*
-                 * this looks ugly, but it seems compiler issues make it
-                 * more efficient than reusing j
-                 */
-                int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
-
-                /*
-                 * page alloc/put takes too long and effects small packet
-                 * throughput, so unsplit small packets and save the alloc/put
-                 * only valid in softirq (napi) context to call kmap_*
-                 */
-                if (l1 && (l1 <= copybreak) &&
-                    ((length + l1) <= adapter->rx_ps_bsize0)) {
-                        u8 *vaddr;
-
-                        ps_page = &buffer_info->ps_pages[0];
+                        /*
+                         * this looks ugly, but it seems compiler issues make
+                         * it more efficient than reusing j
+                         */
+                        int l1 = le16_to_cpu(rx_desc->wb.upper.length[0]);
 
                         /*
-                         * there is no documentation about how to call
-                         * kmap_atomic, so we can't hold the mapping
-                         * very long
+                         * page alloc/put takes too long and effects small
+                         * packet throughput, so unsplit small packets and
+                         * save the alloc/put only valid in softirq (napi)
+                         * context to call kmap_*
                          */
-                        dma_sync_single_for_cpu(&pdev->dev, ps_page->dma,
-                                                PAGE_SIZE, DMA_FROM_DEVICE);
-                        vaddr = kmap_atomic(ps_page->page, KM_SKB_DATA_SOFTIRQ);
-                        memcpy(skb_tail_pointer(skb), vaddr, l1);
-                        kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
-                        dma_sync_single_for_device(&pdev->dev, ps_page->dma,
-                                                   PAGE_SIZE, DMA_FROM_DEVICE);
-
-                        /* remove the CRC */
-                        if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
-                                l1 -= 4;
-
-                        skb_put(skb, l1);
-                        goto copydone;
-                } /* if */
+                        if (l1 && (l1 <= copybreak) &&
+                            ((length + l1) <= adapter->rx_ps_bsize0)) {
+                                u8 *vaddr;
+
+                                ps_page = &buffer_info->ps_pages[0];
+
+                                /*
+                                 * there is no documentation about how to call
+                                 * kmap_atomic, so we can't hold the mapping
+                                 * very long
+                                 */
+                                dma_sync_single_for_cpu(&pdev->dev,
+                                                        ps_page->dma,
+                                                        PAGE_SIZE,
+                                                        DMA_FROM_DEVICE);
+                                vaddr = kmap_atomic(ps_page->page,
+                                                    KM_SKB_DATA_SOFTIRQ);
+                                memcpy(skb_tail_pointer(skb), vaddr, l1);
+                                kunmap_atomic(vaddr, KM_SKB_DATA_SOFTIRQ);
+                                dma_sync_single_for_device(&pdev->dev,
+                                                           ps_page->dma,
+                                                           PAGE_SIZE,
+                                                           DMA_FROM_DEVICE);
+
+                                /* remove the CRC */
+                                if (!(adapter->flags2 & FLAG2_CRC_STRIPPING))
+                                        l1 -= 4;
+
+                                skb_put(skb, l1);
+                                goto copydone;
+                        } /* if */
                 }
 
                 for (j = 0; j < PS_PAGE_BUFFERS; j++) {
@@ -4969,7 +4975,7 @@ static int e1000_maybe_stop_tx(struct e1000_ring *tx_ring, int size)
         return __e1000_maybe_stop_tx(tx_ring, size);
 }
 
-#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1 )
+#define TXD_USE_COUNT(S, X) (((S) >> (X)) + 1)
 static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                                     struct net_device *netdev)
 {