net: macb: Misc cleanup

This patch does the following cleanup to keep master in
sync with rebase branch:
- Correct comment style in one place
- Correct coding style when using case in one place
- Remove repeated code for setting DMA mask in the probe

Signed-off-by: Harini Katakam <harinik@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 1b80a85a0f13b20fe63eb5deceb11fba6100ba4a..5b8cf947e8eff4fc461ab25f1b028e8600b230c0 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2195,8 +2195,7 @@ static void macb_ptp_init(struct macb *bp)
        bp->phc_index = ptp_clock_index(bp->ptp_clock);
 }
 
-/*
- * Configure the receive DMA engine
+/* Configure the receive DMA engine
  * - use the correct receive buffer size
  * - set best burst length for DMA operations
  *   (if not supported by FIFO, it will fallback to default)
@@ -3681,11 +3680,6 @@ static int macb_probe(struct platform_device *pdev)
 
        of_property_read_u32(pdev->dev.of_node, "tsu-clk", &bp->tsu_clk);
 
-#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
-       if (GEM_BFEXT(DBWDEF, gem_readl(bp, DCFG1)) > GEM_DBW32)
-               dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
-#endif
-
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
        if (GEM_BFEXT(DBWDEF, gem_readl(bp, DCFG1)) > GEM_DBW32)
                dma_set_mask(&pdev->dev, DMA_BIT_MASK(44));
@@ -3759,7 +3753,7 @@ static int macb_probe(struct platform_device *pdev)
        netif_carrier_off(dev);
 
        tasklet_init(&bp->hresp_err_tasklet, macb_hresp_error_task,
-                    (unsigned long) bp);
+                    (unsigned long)bp);
 
        netdev_info(dev, "Cadence %s rev 0x%08x at 0x%08lx irq %d (%pM)\n",
                    macb_is_gem(bp) ? "GEM" : "MACB", macb_readl(bp, MID),