sh_eth: Remove redundant alignment adjustment
authorMitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>
Mon, 8 Dec 2014 10:46:21 +0000 (19:46 +0900)
committerSasha Levin <sasha.levin@oracle.com>
Tue, 12 Jul 2016 12:47:33 +0000 (08:47 -0400)
[ Upstream commit 450fa21942fe2c37f0c9f52d1a33bbc081eee288 ]

PTR_ALIGN macro after skb_reserve is redundant, because skb_reserve
function adjusts the alignment of skb->data.

Signed-off-by: Mitsuhiro Kimura <mitsuhiro.kimura.kc@renesas.com>
Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/net/ethernet/renesas/sh_eth.c

index 2e27749007b46e6b5d71c943729db43ca1a5e99b..fe9d7a6d4477a6cdae0c0539a0a12c273b3a8f37 100644 (file)
@@ -1136,7 +1136,7 @@ static void sh_eth_ring_format(struct net_device *ndev)
                rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
                dma_map_single(&ndev->dev, skb->data, rxdesc->buffer_length,
                               DMA_FROM_DEVICE);
-               rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));
+               rxdesc->addr = virt_to_phys(skb->data);
                rxdesc->status = cpu_to_edmac(mdp, RD_RACT | RD_RFP);
 
                /* Rx descriptor address set */
@@ -1472,7 +1472,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
                                       rxdesc->buffer_length, DMA_FROM_DEVICE);
 
                        skb_checksum_none_assert(skb);
-                       rxdesc->addr = virt_to_phys(PTR_ALIGN(skb->data, 4));
+                       rxdesc->addr = virt_to_phys(skb->data);
                }
                if (entry >= mdp->num_rx_ring - 1)
                        rxdesc->status |=