Re: [PATCH v1 13/13] ntb: idt: use devm_kmemdup_array()

Dave Jiang
2025-02-21T17:05:14Z

On 2/21/25 9:53 AM, Raag Jadav wrote:
> Convert to use devm_kmemdup_array() which is more robust.
>
> Signed-off-by: Raag Jadav <raag.jadav@intel.com>

I think this patch [1] from earlier today makes this change unnecessary now.

[1]: https://lore.kernel.org/ntb/20250221085748.2298463-1-arnd@kernel.org/

> ---
> drivers/ntb/hw/idt/ntb_hw_idt.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/ntb/hw/idt/ntb_hw_idt.c b/drivers/ntb/hw/idt/ntb_hw_idt.c
> index 544d8a4d2af5..dbfc53d0ef0c 100644
> --- a/drivers/ntb/hw/idt/ntb_hw_idt.c
> +++ b/drivers/ntb/hw/idt/ntb_hw_idt.c
> @@ -1103,16 +1103,11 @@ static struct idt_mw_cfg *idt_scan_mws(struct idt_ntb_dev *ndev, int port,
> }
> }
>
> - /* Allocate memory for memory window descriptors */
> - ret_mws = devm_kcalloc(&ndev->ntb.pdev->dev, *mw_cnt, sizeof(*ret_mws),
> - GFP_KERNEL);
> - if (!ret_mws)
> - return ERR_PTR(-ENOMEM);
> -
> /* Copy the info of detected memory windows */
> - memcpy(ret_mws, mws, (*mw_cnt)*sizeof(*ret_mws));
> + ret_mws = devm_kmemdup_array(&ndev->ntb.pdev->dev, mws, *mw_cnt,
> + sizeof(mws[0]), GFP_KERNEL);
>
> - return ret_mws;
> + return ret_mws ?: ERR_PTR(-ENOMEM);
> }
>
> /*