Re: [PATCH] stmmac: platform: Move plat_dat checking earlier

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 11/27/2014 6:14 AM, Huacai Chen wrote:

> Original code only check/alloc plat_dat for the CONFIG_OF case, this
> patch check/alloc it earlier and unconditionally to avoid kernel build
> warnings:

> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c:275
> stmmac_pltfr_probe() warn: variable dereferenced before check 'plat_dat'

> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---
>   .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |   18 +++++++++---------
>   1 files changed, 9 insertions(+), 9 deletions(-)

> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index 5b0da39..d254950 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -265,6 +265,15 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
>
>   	plat_dat = dev_get_platdata(&pdev->dev);
>
> +	if (!plat_dat)
> +		plat_dat = devm_kzalloc(&pdev->dev,
> +				sizeof(struct plat_stmmacenet_data),
> +				GFP_KERNEL);

    Please start the continuation lines exactly under & on the first line.

[...]

WBR, Sergei