RE: [PATCH] spi: include "int ret" with macro

[David Laight <David.Laight@xxxxxxxxxx>]

From: Zhao Qiang
> ret is unused when CONFIG_FSL_SOC defined,
> so include it with "#ifndef CONFIG_FSL_SOC".
> 
> Signed-off-by: Zhao Qiang <B45475@xxxxxxxxxxxxx>
> ---
>  drivers/spi/spi-fsl-lib.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c
> index e5d45fc..44aace1 100644
> --- a/drivers/spi/spi-fsl-lib.c
> +++ b/drivers/spi/spi-fsl-lib.c
> @@ -198,8 +198,9 @@ int of_mpc8xxx_spi_probe(struct platform_device *ofdev)
>  	struct mpc8xxx_spi_probe_info *pinfo;
>  	struct fsl_spi_platform_data *pdata;
>  	const void *prop;
> +#ifndef CONFIG_FSL_SOC
>  	int ret = -ENOMEM;
> -
> +#endif

You are removing the blank line after the definition of the locals,
and the initialiser isn't needed.

>  	pinfo = devm_kzalloc(&ofdev->dev, sizeof(*pinfo), GFP_KERNEL);
>  	if (!pinfo)
>  		return -ENOMEM;
> --

I think it might be preferable to define 'ret' inside the conditional
where it is used - which requires an extra {...} block.

A 'sneaky' way to avoid the warning is to 'return ret' when the kzalloc() fails.

	David


��.n��������+%������w��{.n�����{����)��jg��������ݢj����G�������j:+v���w�m������w�������h�����٥