Commit 7a047abb authored by Chuhong Yuan's avatar Chuhong Yuan Committed by Greg Kroah-Hartman

staging: wilc1000: Merge memcpy + le32_to_cpus to get_unaligned_le32

Merge the combo use of memcpy and le32_to_cpus.
Use get_unaligned_le32 instead.
This simplifies the code.
Signed-off-by: default avatarChuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20190725025203.8772-1-hslester96@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 28771088
...@@ -35,8 +35,7 @@ void wilc_wfi_monitor_rx(struct net_device *mon_dev, u8 *buff, u32 size) ...@@ -35,8 +35,7 @@ void wilc_wfi_monitor_rx(struct net_device *mon_dev, u8 *buff, u32 size)
return; return;
/* Get WILC header */ /* Get WILC header */
memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET); header = get_unaligned_le32(buff - HOST_HDR_OFFSET);
le32_to_cpus(&header);
/* /*
* The packet offset field contain info about what type of management * The packet offset field contain info about what type of management
* the frame we are dealing with and ack status * the frame we are dealing with and ack status
......
...@@ -1038,8 +1038,7 @@ void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff, u32 size) ...@@ -1038,8 +1038,7 @@ void wilc_wfi_p2p_rx(struct wilc_vif *vif, u8 *buff, u32 size)
s32 freq; s32 freq;
__le16 fc; __le16 fc;
memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET); header = get_unaligned_le32(buff - HOST_HDR_OFFSET);
le32_to_cpus(&header);
pkt_offset = GET_PKT_OFFSET(header); pkt_offset = GET_PKT_OFFSET(header);
if (pkt_offset & IS_MANAGMEMENT_CALLBACK) { if (pkt_offset & IS_MANAGMEMENT_CALLBACK) {
......
...@@ -703,8 +703,7 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size) ...@@ -703,8 +703,7 @@ static void wilc_wlan_handle_rx_buff(struct wilc *wilc, u8 *buffer, int size)
do { do {
buff_ptr = buffer + offset; buff_ptr = buffer + offset;
memcpy(&header, buff_ptr, 4); header = get_unaligned_le32(buff_ptr);
le32_to_cpus(&header);
is_cfg_packet = (header >> 31) & 0x1; is_cfg_packet = (header >> 31) & 0x1;
pkt_offset = (header >> 22) & 0x1ff; pkt_offset = (header >> 22) & 0x1ff;
...@@ -874,10 +873,8 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer, ...@@ -874,10 +873,8 @@ int wilc_wlan_firmware_download(struct wilc *wilc, const u8 *buffer,
offset = 0; offset = 0;
do { do {
memcpy(&addr, &buffer[offset], 4); addr = get_unaligned_le32(&buffer[offset]);
memcpy(&size, &buffer[offset + 4], 4); size = get_unaligned_le32(&buffer[offset + 4]);
le32_to_cpus(&addr);
le32_to_cpus(&size);
acquire_bus(wilc, WILC_BUS_ACQUIRE_ONLY); acquire_bus(wilc, WILC_BUS_ACQUIRE_ONLY);
offset += 8; offset += 8;
while (((int)size) && (offset < buffer_size)) { while (((int)size) && (offset < buffer_size)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment