wifi: mac80211: Use kvmemdup to simplify the code

[PATCH -next] wifi: mac80211: Use kvmemdup to simplify the code

Posted by Jinjie Ruan 1 year, 5 months ago

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

No functional change.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
index d86f28b8bc60..7717d7764d2d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
@@ -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 0;
 			}
 		}
-- 
2.34.1

Re: [PATCH -next] wifi: mac80211: Use kvmemdup to simplify the code

Posted by Arend Van Spriel 1 year, 5 months ago

On August 21, 2024 4:26:17 AM Jinjie Ruan <ruanjinjie@huawei.com> wrote:

> Use kvmemdup instead of kvmalloc() + memcpy() to simplify the code.
>
> No functional change.

Comment below...

> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 
> b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
> index d86f28b8bc60..7717d7764d2d 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
> @@ -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;

This is the only jump to fail: so instead simply return here with -ENOMEM 
and remove the fail: label.

Regards,
Arend

> - memcpy(*pbuf, pdata, len);
>  return 0;
>  }
>  }
> --
> 2.34.1

Re: [PATCH -next] wifi: mac80211: Use kvmemdup to simplify the code

Posted by Jinjie Ruan 1 year, 5 months ago


On 2024/8/21 13:48, Arend Van Spriel wrote:
> On August 21, 2024 4:26:17 AM Jinjie Ruan <ruanjinjie@huawei.com> wrote:
> 
>> Use kvmemdup instead of kvmalloc() + memcpy() to simplify the code.
>>
>> No functional change.
> 
> Comment below...
> 
>> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
>> ---
>> drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git
>> a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
>> b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
>> index d86f28b8bc60..7717d7764d2d 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
>> @@ -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;
> 
> This is the only jump to fail: so instead simply return here with
> -ENOMEM and remove the fail: label.

Right. Thank you!

> 
> Regards,
> Arend
> 
>> - memcpy(*pbuf, pdata, len);
>>  return 0;
>>  }
>>  }
>> -- 
>> 2.34.1
> 
> 
>

RE: [PATCH -next] wifi: mac80211: Use kvmemdup to simplify the code

Posted by Ping-Ke Shih 1 year, 5 months ago

Jinjie Ruan <ruanjinjie@huawei.com> wrote:
> 
> Use kvmemdup instead of kvmalloc() + memcpy() to simplify the code.
> 
> No functional change.
> 
> Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
> ---
>  drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c | 3 +--

Subject prefix should be "wifi: brcmsmac:".