Re: [PATCH RFC 1/3] dt:net:stmmac: Allocate platform data only ifits NULL.

[Giuseppe CAVALLARO]

On 7/1/2013 1:43 PM, Srinivas KANDAGATLA wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@xxxxxx>
>
> In some DT use-cases platform data might be already allocated and passed
> via AUXDATA. These are the cases where machine level code populates few
> callbacks in the platform data.
>
> This patch adds check and reuses platform_data if its valid, before
> allocating a new one.

Yes, we had seen this long time ago and IIRC i prepared the patch
so

Acked-by: Giuseppe Cavallaro <peppe.cavallaro@xxxxxx>

> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxx>
> ---
>   .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index 1d3780f..5907920 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -92,8 +92,10 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
>   	if (IS_ERR(addr))
>   		return PTR_ERR(addr);
>
> +	plat_dat = pdev->dev.platform_data;
>   	if (pdev->dev.of_node) {
> -		plat_dat = devm_kzalloc(&pdev->dev,
> +		if (!plat_dat)
> +			plat_dat = devm_kzalloc(&pdev->dev,
>   					sizeof(struct plat_stmmacenet_data),
>   					GFP_KERNEL);
>   		if (!plat_dat) {
> @@ -106,8 +108,6 @@ static int stmmac_pltfr_probe(struct platform_device *pdev)
>   			pr_err("%s: main dt probe failed", __func__);
>   			return ret;
>   		}
> -	} else {
> -		plat_dat = pdev->dev.platform_data;
>   	}
>
>   	/* Custom initialisation (if needed)*/

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/