Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / ethoc.c

diff --git a/drivers/net/ethernet/ethoc.c b/drivers/net/ethernet/ethoc.c
index cf579fb39bc5cf575f217902b725052d34456d0e..4de8cfd149cfbd0fb6ed0c2782852c1eee599fa9 100644 (file)
--- a/drivers/net/ethernet/ethoc.c
+++ b/drivers/net/ethernet/ethoc.c
@@ -1030,8 +1030,8 @@ static int ethoc_probe(struct platform_device *pdev)
        }
 
        /* Allow the platform setup code to pass in a MAC address. */
-       if (pdev->dev.platform_data) {
-               struct ethoc_platform_data *pdata = pdev->dev.platform_data;
+       if (dev_get_platdata(&pdev->dev)) {
+               struct ethoc_platform_data *pdata = dev_get_platdata(&pdev->dev);
                memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN);
                priv->phy_id = pdata->phy_id;
        } else {