1 files changed, 24 insertions, 22 deletions

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index f25681ba6418..2ba0934e52dc 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -187,7 +187,7 @@ static void macb_get_hwaddr(struct macb *bp)
 
         pdata = dev_get_platdata(&bp->pdev->dev);
 
-        /* Check all 4 address register for vaild address */
+        /* Check all 4 address register for valid address */
         for (i = 0; i < 4; i++) {
                 bottom = macb_or_gem_readl(bp, SA1B + i * 8);
                 top = macb_or_gem_readl(bp, SA1T + i * 8);
@@ -295,7 +295,7 @@ static void macb_set_tx_clk(struct clk *clk, int speed, struct net_device *dev)
         ferr = DIV_ROUND_UP(ferr, rate / 100000);
         if (ferr > 5)
                 netdev_warn(dev, "unable to generate target frequency: %ld Hz\n",
-                                rate);
+                            rate);
 
         if (clk_set_rate(clk, rate_rounded))
                 netdev_err(dev, "adjusting tx_clk failed.\n");
@@ -429,7 +429,7 @@ static int macb_mii_init(struct macb *bp)
         macb_writel(bp, NCR, MACB_BIT(MPE));
 
         bp->mii_bus = mdiobus_alloc();
-        if (bp->mii_bus == NULL) {
+        if (!bp->mii_bus) {
                 err = -ENOMEM;
                 goto err_out;
         }
@@ -438,7 +438,7 @@ static int macb_mii_init(struct macb *bp)
         bp->mii_bus->read = &macb_mdio_read;
         bp->mii_bus->write = &macb_mdio_write;
         snprintf(bp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
-                bp->pdev->name, bp->pdev->id);
+                 bp->pdev->name, bp->pdev->id);
         bp->mii_bus->priv = bp;
         bp->mii_bus->parent = &bp->dev->dev;
         pdata = dev_get_platdata(&bp->pdev->dev);
@@ -659,7 +659,7 @@ static void macb_tx_interrupt(struct macb_queue *queue)
                 queue_writel(queue, ISR, MACB_BIT(TCOMP));
 
         netdev_vdbg(bp->dev, "macb_tx_interrupt status = 0x%03lx\n",
-                (unsigned long)status);
+                    (unsigned long)status);
 
         head = queue->tx_head;
         for (tail = queue->tx_tail; tail != head; tail++) {
@@ -728,10 +728,10 @@ static void gem_rx_refill(struct macb *bp)
 
                 bp->rx_prepared_head++;
 
-                if (bp->rx_skbuff[entry] == NULL) {
+                if (!bp->rx_skbuff[entry]) {
                         /* allocate sk_buff for this free entry in ring */
                         skb = netdev_alloc_skb(bp->dev, bp->rx_buffer_size);
-                        if (unlikely(skb == NULL)) {
+                        if (unlikely(!skb)) {
                                 netdev_err(bp->dev,
                                            "Unable to allocate sk_buff\n");
                                 break;
@@ -765,7 +765,7 @@ static void gem_rx_refill(struct macb *bp)
         wmb();
 
         netdev_vdbg(bp->dev, "rx ring: prepared head %d, tail %d\n",
-                   bp->rx_prepared_head, bp->rx_tail);
+                    bp->rx_prepared_head, bp->rx_tail);
 }
 
 /* Mark DMA descriptors from begin up to and not including end as unused */
@@ -879,8 +879,8 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
         len = desc->ctrl & bp->rx_frm_len_mask;
 
         netdev_vdbg(bp->dev, "macb_rx_frame frags %u - %u (len %u)\n",
-                macb_rx_ring_wrap(first_frag),
-                macb_rx_ring_wrap(last_frag), len);
+                    macb_rx_ring_wrap(first_frag),
+                    macb_rx_ring_wrap(last_frag), len);
 
         /* The ethernet header starts NET_IP_ALIGN bytes into the
          * first buffer. Since the header is 14 bytes, this makes the
@@ -922,7 +922,8 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
                         frag_len = len - offset;
                 }
                 skb_copy_to_linear_data_offset(skb, offset,
-                                macb_rx_buffer(bp, frag), frag_len);
+                                               macb_rx_buffer(bp, frag),
+                                               frag_len);
                 offset += bp->rx_buffer_size;
                 desc = macb_rx_desc(bp, frag);
                 desc->addr &= ~MACB_BIT(RX_USED);
@@ -940,7 +941,7 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
         bp->stats.rx_packets++;
         bp->stats.rx_bytes += skb->len;
         netdev_vdbg(bp->dev, "received skb of length %u, csum: %08x\n",
-                   skb->len, skb->csum);
+                    skb->len, skb->csum);
         netif_receive_skb(skb);
 
         return 0;
@@ -1047,7 +1048,7 @@ static int macb_poll(struct napi_struct *napi, int budget)
         work_done = 0;
 
         netdev_vdbg(bp->dev, "poll: status = %08lx, budget = %d\n",
-                   (unsigned long)status, budget);
+                    (unsigned long)status, budget);
 
         work_done = bp->macbgem_ops.mog_rx(bp, budget);
         if (work_done < budget) {
@@ -1262,7 +1263,7 @@ static unsigned int macb_tx_map(struct macb *bp,
         }
 
         /* Should never happen */
-        if (unlikely(tx_skb == NULL)) {
+        if (unlikely(!tx_skb)) {
                 netdev_err(bp->dev, "BUG! empty skb!\n");
                 return 0;
         }
@@ -1332,16 +1333,16 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 #if defined(DEBUG) && defined(VERBOSE_DEBUG)
         netdev_vdbg(bp->dev,
-                   "start_xmit: queue %hu len %u head %p data %p tail %p end %p\n",
-                   queue_index, skb->len, skb->head, skb->data,
-                   skb_tail_pointer(skb), skb_end_pointer(skb));
+                    "start_xmit: queue %hu len %u head %p data %p tail %p end %p\n",
+                    queue_index, skb->len, skb->head, skb->data,
+                    skb_tail_pointer(skb), skb_end_pointer(skb));
         print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_OFFSET, 16, 1,
                        skb->data, 16, true);
 #endif
 
         /* Count how many TX buffer descriptors are needed to send this
          * socket buffer: skb fragments of jumbo frames may need to be
-         * splitted into many buffer descriptors.
+         * split into many buffer descriptors.
          */
         count = DIV_ROUND_UP(skb_headlen(skb), bp->max_tx_length);
         nr_frags = skb_shinfo(skb)->nr_frags;
@@ -1392,8 +1393,8 @@ static void macb_init_rx_buffer_size(struct macb *bp, size_t size)
 
                 if (bp->rx_buffer_size % RX_BUFFER_MULTIPLE) {
                         netdev_dbg(bp->dev,
-                                    "RX buffer must be multiple of %d bytes, expanding\n",
-                                    RX_BUFFER_MULTIPLE);
+                                   "RX buffer must be multiple of %d bytes, expanding\n",
+                                   RX_BUFFER_MULTIPLE);
                         bp->rx_buffer_size =
                                 roundup(bp->rx_buffer_size, RX_BUFFER_MULTIPLE);
                 }
@@ -1416,7 +1417,7 @@ static void gem_free_rx_buffers(struct macb *bp)
         for (i = 0; i < RX_RING_SIZE; i++) {
                 skb = bp->rx_skbuff[i];
 
-                if (skb == NULL)
+                if (!skb)
                         continue;
 
                 desc = &bp->rx_ring[i];
@@ -1817,7 +1818,8 @@ static void macb_sethashtable(struct net_device *dev)
         unsigned int bitnr;
         struct macb *bp = netdev_priv(dev);
 
-        mc_filter[0] = mc_filter[1] = 0;
+        mc_filter[0] = 0;
+        mc_filter[1] = 0;
 
         netdev_for_each_mc_addr(ha, dev) {
                 bitnr = hash_get_index(ha->addr);