net: usb: Merge cpu_to_le32s + memcpy to put_unaligned_le32

Merge the combo uses of cpu_to_le32s and memcpy.
Use put_unaligned_le32 instead.
This simplifies the code.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index b39ee714fb0130cf5b1355f047962f5dc4d0cccb..e39f41efda3ec1ecac5616d509f183c99ea69a33 100644 (file)
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -221,6 +221,7 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
        int tailroom = skb_tailroom(skb);
        u32 packet_len;
        u32 padbytes = 0xffff0000;
+       void *ptr;
 
        padlen = ((skb->len + 4) & (dev->maxpacket - 1)) ? 0 : 4;
 
@@ -256,13 +257,11 @@ struct sk_buff *asix_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
        }
 
        packet_len = ((skb->len ^ 0x0000ffff) << 16) + skb->len;
-       skb_push(skb, 4);
-       cpu_to_le32s(&packet_len);
-       skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
+       ptr = skb_push(skb, 4);
+       put_unaligned_le32(packet_len, ptr);
 
        if (padlen) {
-               cpu_to_le32s(&padbytes);
-               memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
+               put_unaligned_le32(padbytes, skb_tail_pointer(skb));
                skb_put(skb, sizeof(padbytes));
        }
 

diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c
index 72d165114b674fdc8629e8f7d00af80cde67dca9..daa54486ab09468a331ebc13e2c23d8ba35cdead 100644 (file)
--- a/drivers/net/usb/ax88179_178a.c
+++ b/drivers/net/usb/ax88179_178a.c
@@ -1421,6 +1421,7 @@ ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
        int frame_size = dev->maxpacket;
        int mss = skb_shinfo(skb)->gso_size;
        int headroom;
+       void *ptr;
 
        tx_hdr1 = skb->len;
        tx_hdr2 = mss;
@@ -1435,13 +1436,9 @@ ax88179_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
                return NULL;
        }
 
-       skb_push(skb, 4);
-       cpu_to_le32s(&tx_hdr2);
-       skb_copy_to_linear_data(skb, &tx_hdr2, 4);
-
-       skb_push(skb, 4);
-       cpu_to_le32s(&tx_hdr1);
-       skb_copy_to_linear_data(skb, &tx_hdr1, 4);
+       ptr = skb_push(skb, 8);
+       put_unaligned_le32(tx_hdr1, ptr);
+       put_unaligned_le32(tx_hdr2, ptr + 4);
 
        return skb;
 }

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 9c33b35bd1558ceeffbbb805d989f3b045ff9dc5..769bb262fbec9852dcb8000bc03e9f39541c88e0 100644 (file)
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -2729,6 +2729,7 @@ static struct sk_buff *lan78xx_tx_prep(struct lan78xx_net *dev,
                                       struct sk_buff *skb, gfp_t flags)
 {
        u32 tx_cmd_a, tx_cmd_b;
+       void *ptr;
 
        if (skb_cow_head(skb, TX_OVERHEAD)) {
                dev_kfree_skb_any(skb);
@@ -2757,13 +2758,9 @@ static struct sk_buff *lan78xx_tx_prep(struct lan78xx_net *dev,
                tx_cmd_b |= skb_vlan_tag_get(skb) & TX_CMD_B_VTAG_MASK_;
        }
 
-       skb_push(skb, 4);
-       cpu_to_le32s(&tx_cmd_b);
-       memcpy(skb->data, &tx_cmd_b, 4);
-
-       skb_push(skb, 4);
-       cpu_to_le32s(&tx_cmd_a);
-       memcpy(skb->data, &tx_cmd_a, 4);
+       ptr = skb_push(skb, 8);
+       put_unaligned_le32(tx_cmd_a, ptr);
+       put_unaligned_le32(tx_cmd_b, ptr + 4);
 
        return skb;
 }

diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 7fac9db5380d2520c50acef3dab7477038da5c56..9556d431885f53634d303ed93bc5a8d6643f97a9 100644 (file)
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -2255,6 +2255,7 @@ static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev,
                                         struct sk_buff *skb, gfp_t flags)
 {
        u32 tx_cmd_a, tx_cmd_b;
+       void *ptr;
 
        if (skb_cow_head(skb, SMSC75XX_TX_OVERHEAD)) {
                dev_kfree_skb_any(skb);
@@ -2275,13 +2276,9 @@ static struct sk_buff *smsc75xx_tx_fixup(struct usbnet *dev,
                tx_cmd_b = 0;
        }
 
-       skb_push(skb, 4);
-       cpu_to_le32s(&tx_cmd_b);
-       memcpy(skb->data, &tx_cmd_b, 4);
-
-       skb_push(skb, 4);
-       cpu_to_le32s(&tx_cmd_a);
-       memcpy(skb->data, &tx_cmd_a, 4);
+       ptr = skb_push(skb, 8);
+       put_unaligned_le32(tx_cmd_a, ptr);
+       put_unaligned_le32(tx_cmd_b, ptr + 4);
 
        return skb;
 }

diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
index 35f39f23d88144195b8f007035f207d38b48c1fd..c5d4a0060124cf238543b3c9f3f9de603749a708 100644 (file)
--- a/drivers/net/usb/sr9800.c
+++ b/drivers/net/usb/sr9800.c
@@ -115,6 +115,7 @@ static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
        u32 padbytes = 0xffff0000;
        u32 packet_len;
        int padlen;
+       void *ptr;
 
        padlen = ((skb->len + 4) % (dev->maxpacket - 1)) ? 0 : 4;
 
@@ -133,14 +134,12 @@ static struct sk_buff *sr_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
                        return NULL;
        }
 
-       skb_push(skb, 4);
+       ptr = skb_push(skb, 4);
        packet_len = (((skb->len - 4) ^ 0x0000ffff) << 16) + (skb->len - 4);
-       cpu_to_le32s(&packet_len);
-       skb_copy_to_linear_data(skb, &packet_len, sizeof(packet_len));
+       put_unaligned_le32(packet_len, ptr);
 
        if (padlen) {
-               cpu_to_le32s(&padbytes);
-               memcpy(skb_tail_pointer(skb), &padbytes, sizeof(padbytes));
+               put_unaligned_le32(padbytes, skb_tail_pointer(skb));
                skb_put(skb, sizeof(padbytes));
        }