Commit ab8c31dd authored by Fuqian Huang's avatar Fuqian Huang Committed by Kalle Valo
Browse files

net/wireless: Use kmemdup rather than duplicating its implementation 



kmemdup is introduced to duplicate a region of memory in a neat way.
Rather than kmalloc/kzalloc + memcpy, which the programmer needs to
write the size twice (sometimes lead to mistakes), kmemdup improves
readability, leads to smaller code and also reduce the chances of mistakes.
Suggestion to use kmemdup rather than using kmalloc/kzalloc + memcpy.

Signed-off-by: default avatarFuqian Huang <huangfq.daxian@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0a3ce169

drivers/net/wireless/ath/ath6kl/wmi.c

+2 −4
Original line number Diff line number Diff line
@@ -3650,7 +3650,7 @@ static int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u8 if_idx, u32 id, 
	if (wait)

		return -EINVAL; /* Offload for wait not supported */



	buf = kmalloc(data_len, GFP_KERNEL);

	buf = kmemdup(data, data_len, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;
@@ -3661,7 +3661,6 @@ static int ath6kl_wmi_send_action_cmd(struct wmi *wmi, u8 if_idx, u32 id, 
	}



	kfree(wmi->last_mgmt_tx_frame);

	memcpy(buf, data, data_len);

	wmi->last_mgmt_tx_frame = buf;

	wmi->last_mgmt_tx_frame_len = data_len;
@@ -3689,7 +3688,7 @@ static int __ath6kl_wmi_send_mgmt_cmd(struct wmi *wmi, u8 if_idx, u32 id, 
	if (wait)

		return -EINVAL; /* Offload for wait not supported */



	buf = kmalloc(data_len, GFP_KERNEL);

	buf = kmemdup(data, data_len, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;
@@ -3700,7 +3699,6 @@ static int __ath6kl_wmi_send_mgmt_cmd(struct wmi *wmi, u8 if_idx, u32 id, 
	}



	kfree(wmi->last_mgmt_tx_frame);

	memcpy(buf, data, data_len);

	wmi->last_mgmt_tx_frame = buf;

	wmi->last_mgmt_tx_frame_len = data_len;

drivers/net/wireless/st/cw1200/queue.c

+1 −2
Original line number Diff line number Diff line
@@ -79,10 +79,9 @@ static void cw1200_queue_register_post_gc(struct list_head *gc_list, 
					  struct cw1200_queue_item *item)

{

	struct cw1200_queue_item *gc_item;

	gc_item = kmalloc(sizeof(struct cw1200_queue_item),

	gc_item = kmemdup(item, sizeof(struct cw1200_queue_item),

			GFP_ATOMIC);

	BUG_ON(!gc_item);

	memcpy(gc_item, item, sizeof(struct cw1200_queue_item));

	list_add_tail(&gc_item->head, gc_list);

}

drivers/net/wireless/ti/wlcore/main.c

+1 −2
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ int wl1271_rx_filter_alloc_field(struct wl12xx_rx_filter *filter, 


	field = &filter->fields[filter->num_fields];



	field->pattern = kzalloc(len, GFP_KERNEL);

	field->pattern = kmemdup(pattern, len, GFP_KERNEL);

	if (!field->pattern) {

		wl1271_warning("Failed to allocate RX filter pattern");

		return -ENOMEM;
@@ -1445,7 +1445,6 @@ int wl1271_rx_filter_alloc_field(struct wl12xx_rx_filter *filter, 
	field->offset = cpu_to_le16(offset);

	field->flags = flags;

	field->len = len;

	memcpy(field->pattern, pattern, len);



	return 0;

}