tee: optee: smc: remove unnecessary NULL check before release_firmware()

[PATCH] tee: optee: smc: remove unnecessary NULL check before release_firmware()

Posted by Chen Ni 8 months, 1 week ago

release_firmware() checks for NULL pointers internally.
Remove unneeded NULL check for fmw here.

Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
---
 drivers/tee/optee/smc_abi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index f0c3ac1103bb..26f8f7bbbe56 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1551,8 +1551,7 @@ static int optee_load_fw(struct platform_device *pdev,
 		  data_pa_high, data_pa_low, 0, 0, 0, &res);
 	if (!rc)
 		rc = res.a0;
-	if (fw)
-		release_firmware(fw);
+	release_firmware(fw);
 	kfree(data_buf);
 
 	if (!rc) {
-- 
2.25.1

Re: [PATCH] tee: optee: smc: remove unnecessary NULL check before release_firmware()

Posted by Sumit Garg 7 months, 4 weeks ago

On Thu, Apr 10, 2025 at 03:56:35PM +0800, Chen Ni wrote:
> release_firmware() checks for NULL pointers internally.
> Remove unneeded NULL check for fmw here.
> 
> Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
> ---
>  drivers/tee/optee/smc_abi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>

-Sumit

> 
> diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> index f0c3ac1103bb..26f8f7bbbe56 100644
> --- a/drivers/tee/optee/smc_abi.c
> +++ b/drivers/tee/optee/smc_abi.c
> @@ -1551,8 +1551,7 @@ static int optee_load_fw(struct platform_device *pdev,
>  		  data_pa_high, data_pa_low, 0, 0, 0, &res);
>  	if (!rc)
>  		rc = res.a0;
> -	if (fw)
> -		release_firmware(fw);
> +	release_firmware(fw);
>  	kfree(data_buf);
>  
>  	if (!rc) {
> -- 
> 2.25.1
>

Re: [PATCH] tee: optee: smc: remove unnecessary NULL check before release_firmware()

Posted by Jens Wiklander 7 months, 3 weeks ago

On Thu, Apr 24, 2025 at 6:54 AM Sumit Garg <sumit.garg@kernel.org> wrote:
>
> On Thu, Apr 10, 2025 at 03:56:35PM +0800, Chen Ni wrote:
> > release_firmware() checks for NULL pointers internally.
> > Remove unneeded NULL check for fmw here.
> >
> > Signed-off-by: Chen Ni <nichen@iscas.ac.cn>
> > ---
> >  drivers/tee/optee/smc_abi.c | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
>
> Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>

I'm picking up this.

Thanks,
Jens

>
> -Sumit
>
> >
> > diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> > index f0c3ac1103bb..26f8f7bbbe56 100644
> > --- a/drivers/tee/optee/smc_abi.c
> > +++ b/drivers/tee/optee/smc_abi.c
> > @@ -1551,8 +1551,7 @@ static int optee_load_fw(struct platform_device *pdev,
> >                 data_pa_high, data_pa_low, 0, 0, 0, &res);
> >       if (!rc)
> >               rc = res.a0;
> > -     if (fw)
> > -             release_firmware(fw);
> > +     release_firmware(fw);
> >       kfree(data_buf);
> >
> >       if (!rc) {
> > --
> > 2.25.1
> >