[PATCH] misc: fs_loader: Use buffer pointer in request_firmware_into_buf_via_script()

[Weijie Gao]

Hi Marek,

On Mon, 2025-09-22 at 00:35 +0200, Marek Vasut wrote:
> External email : Please do not click links or open attachments until
> you have verified the sender or the content.
> 
> 
> Use plain buffer pointer in request_firmware_into_buf_via_script()
> instead of a pointer to pointer. The later is not necessary as the
> request_firmware_into_buf_via_script() does not modify the buffer
> pointer. Update the mediatek driver to match.
> 
> Signed-off-by: Marek Vasut <marek.vasut+renesas at mailbox.org>
> ---
> Cc: "Lucien.Jheng" <lucienzx159 at gmail.com>
> Cc: Alif Zakuan Yuslaimi <alif.zakuan.yuslaimi at altera.com>
> Cc: Chunfeng Yun <chunfeng.yun at mediatek.com>
> Cc: GSS_MTK_Uboot_upstream <GSS_MTK_Uboot_upstream at mediatek.com>
> Cc: Joe Hershberger <joe.hershberger at ni.com>
> Cc: Ramon Fried <rfried.dev at gmail.com>
> Cc: Ryder Lee <ryder.lee at mediatek.com>
> Cc: Sky Huang <SkyLake.Huang at mediatek.com>
> Cc: Tom Rini <trini at konsulko.com>
> Cc: Weijie Gao <weijie.gao at mediatek.com>
> Cc: u-boot at lists.denx.de
> ---
>  drivers/misc/fs_loader.c             | 4 ++--
>  drivers/net/phy/mediatek/mtk-2p5ge.c | 6 +++---
>  include/fs_loader.h                  | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/misc/fs_loader.c b/drivers/misc/fs_loader.c
> index 32aff35835b..d641647e040 100644
> --- a/drivers/misc/fs_loader.c
> +++ b/drivers/misc/fs_loader.c
> @@ -228,7 +228,7 @@ int request_firmware_into_buf(struct udevice
> *dev,
>         return ret;
>  }
> 
> -int request_firmware_into_buf_via_script(void **buf, size_t
> max_size,
> +int request_firmware_into_buf_via_script(void *buf, size_t max_size,
>                                          const char *script_name,
>                                          size_t *retsize)
>  {
> @@ -270,7 +270,7 @@ int request_firmware_into_buf_via_script(void
> **buf, size_t max_size,
>         if (retsize)
>                 *retsize = size;
> 
> -       memcpy(*buf, (void *)addr, size);
> +       memcpy(buf, (void *)addr, size);
> 
>         return 0;
>  }
> diff --git a/drivers/net/phy/mediatek/mtk-2p5ge.c
> b/drivers/net/phy/mediatek/mtk-2p5ge.c
> index ab5007389a9..0e704bdb04d 100644
> --- a/drivers/net/phy/mediatek/mtk-2p5ge.c
> +++ b/drivers/net/phy/mediatek/mtk-2p5ge.c
> @@ -249,7 +249,7 @@ int __weak mt7987_i2p5ge_get_fw(void **fw, size_t
> *fwsize,
>                 return -ENOMEM;
> 
>         ret = request_firmware_into_buf_via_script(
> -               &pmb, MT7987_2P5GE_PMB_FW_SIZE,
> +               pmb, MT7987_2P5GE_PMB_FW_SIZE,
>                 "mt7987_i2p5ge_load_pmb_firmware", fwsize);
>         if (ret) {
>                 free(pmb);
> @@ -263,7 +263,7 @@ int __weak mt7987_i2p5ge_get_fw(void **fw, size_t
> *fwsize,
>         }
> 
>         ret = request_firmware_into_buf_via_script(
> -               &dsp, MT7987_2P5GE_DSPBITTB_SIZE,
> +               dsp, MT7987_2P5GE_DSPBITTB_SIZE,
>                 "mt7987_i2p5ge_load_dspbit_firmware", dspfwsize);
>         if (ret) {
>                 free(pmb);
> @@ -476,7 +476,7 @@ int __weak mt7988_i2p5ge_get_fw(void **fw, size_t
> *size)
>                 return -ENOMEM;
> 
>         ret = request_firmware_into_buf_via_script(
> -               &pmb, MT7988_2P5GE_PMB_FW_SIZE,
> +               pmb, MT7988_2P5GE_PMB_FW_SIZE,
>                 "mt7988_i2p5ge_load_pmb_firmware", size);
>         if (ret) {
>                 free(pmb);
> diff --git a/include/fs_loader.h b/include/fs_loader.h
> index 1cf6d6dd05f..3afd9e62b4a 100644
> --- a/include/fs_loader.h
> +++ b/include/fs_loader.h
> @@ -87,7 +87,7 @@ int get_fs_loader(struct udevice **dev);
>   *   env set fw_addr ${loadaddr} && env set fw_size ${filesize}
>   * Return: 0 on success, negative value on error.
>   */
> -int request_firmware_into_buf_via_script(void **buf, size_t
> max_size,
> +int request_firmware_into_buf_via_script(void *buf, size_t max_size,
>                                          const char *script_name,
>                                          size_t *retsize);
>  #endif
> --
> 2.51.0
> 

Reviewed-by: Weijie Gao <weijie.gao at mediatek.com>

Best Regards,
Weijie