Commit d3879229 authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Kalle Valo
Browse files

wifi: brcmsmac: Use kvmemdup to simplify the code 



Use kvmemdup instead of kvmalloc() + memcpy() to simplify the code.

No functional change.

Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20240821070257.2298559-1-ruanjinjie@huawei.com
parent 25f85541

drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c

+2 −4
Original line number Diff line number Diff line
@@ -1611,10 +1611,9 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx) 
			if (le32_to_cpu(hdr->idx) == idx) {

				pdata = wl->fw.fw_bin[i]->data +

					le32_to_cpu(hdr->offset);

				*pbuf = kvmalloc(len, GFP_KERNEL);

				*pbuf = kvmemdup(pdata, len, GFP_KERNEL);

				if (*pbuf == NULL)

					goto fail;

				memcpy(*pbuf, pdata, len);

					return -ENOMEM;

				return 0;

			}

		}
@@ -1622,7 +1621,6 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx) 
	brcms_err(wl->wlc->hw->d11core,

		  "ERROR: ucode buf tag:%d can not be found!\n", idx);

	*pbuf = NULL;

fail:

	return -ENODATA;

}