Commit d741434c authored Jul 04, 2013 by Srinivas Kandagatla Committed by David S. Miller Jul 04, 2013

dt:net:stmmac: Allocate platform data only if its NULL.



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.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c9324d18

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -92,7 +92,9 @@ 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) {
		if (!plat_dat)
		plat_dat = devm_kzalloc(&pdev->dev,
		sizeof(struct plat_stmmacenet_data),
		GFP_KERNEL);
		@@ -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)*/