| Message ID | 20190719073614.1850-1-hslester96@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | bb448f8a60ea93722edb28418448e0008d148b0c |
| Headers | show |
| Series | net: lan78xx: Merge memcpy + lexx_to_cpus to get_unaligned_lexx | expand |
> From: Chuhong Yuan <hslester96@gmail.com> > Sent: Friday, July 19, 2019 3:36 AM > Cc: Woojung Huh - C21699 <Woojung.Huh@microchip.com>; UNGLinuxDriver > <UNGLinuxDriver@microchip.com>; David S . Miller <davem@davemloft.net>; > netdev@vger.kernel.org; linux-usb@vger.kernel.org; linux-kernel@vger.kernel.org; Chuhong Yuan > <hslester96@gmail.com> > Subject: [PATCH] net: lan78xx: Merge memcpy + lexx_to_cpus to get_unaligned_lexx > > External E-Mail > > > Merge the combo use of memcpy and lexx_to_cpus. > Use get_unaligned_lexx instead. > This simplifies the code. > > Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Acked-by: Woojung Huh <woojung.huh@microchip.com>
From: Chuhong Yuan <hslester96@gmail.com> Date: Fri, 19 Jul 2019 15:36:15 +0800 > Merge the combo use of memcpy and lexx_to_cpus. > Use get_unaligned_lexx instead. > This simplifies the code. > > Signed-off-by: Chuhong Yuan <hslester96@gmail.com> Applied.
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 3d92ea6fcc02..9c33b35bd155 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -1258,8 +1258,7 @@ static void lan78xx_status(struct lan78xx_net *dev, struct urb *urb) return; } - memcpy(&intdata, urb->transfer_buffer, 4); - le32_to_cpus(&intdata); + intdata = get_unaligned_le32(urb->transfer_buffer); if (intdata & INT_ENP_PHY_INT) { netif_dbg(dev, link, dev->net, "PHY INTR: 0x%08x\n", intdata); @@ -3105,16 +3104,13 @@ static int lan78xx_rx(struct lan78xx_net *dev, struct sk_buff *skb) struct sk_buff *skb2; unsigned char *packet; - memcpy(&rx_cmd_a, skb->data, sizeof(rx_cmd_a)); - le32_to_cpus(&rx_cmd_a); + rx_cmd_a = get_unaligned_le32(skb->data); skb_pull(skb, sizeof(rx_cmd_a)); - memcpy(&rx_cmd_b, skb->data, sizeof(rx_cmd_b)); - le32_to_cpus(&rx_cmd_b); + rx_cmd_b = get_unaligned_le32(skb->data); skb_pull(skb, sizeof(rx_cmd_b)); - memcpy(&rx_cmd_c, skb->data, sizeof(rx_cmd_c)); - le16_to_cpus(&rx_cmd_c); + rx_cmd_c = get_unaligned_le16(skb->data); skb_pull(skb, sizeof(rx_cmd_c)); packet = skb->data;
Merge the combo use of memcpy and lexx_to_cpus. Use get_unaligned_lexx instead. This simplifies the code. Signed-off-by: Chuhong Yuan <hslester96@gmail.com> --- drivers/net/usb/lan78xx.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)