net: qcom/emac: use device_get_mac_address
authorTimur Tabi <timur@codeaurora.org>
Wed, 28 Sep 2016 16:58:43 +0000 (11:58 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Sep 2016 05:50:13 +0000 (01:50 -0400)
Replace the DT-specific of_get_mac_address() function with
device_get_mac_address, which works on both DT and ACPI platforms.  This
change makes it easier to add ACPI support.

Signed-off-by: Timur Tabi <timur@codeaurora.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qualcomm/emac/emac.c

index 429b4cb..551df1c 100644 (file)
@@ -531,18 +531,16 @@ static void emac_clks_teardown(struct emac_adapter *adpt)
 static int emac_probe_resources(struct platform_device *pdev,
                                struct emac_adapter *adpt)
 {
-       struct device_node *node = pdev->dev.of_node;
        struct net_device *netdev = adpt->netdev;
        struct resource *res;
-       const void *maddr;
+       char maddr[ETH_ALEN];
        int ret = 0;
 
        /* get mac address */
-       maddr = of_get_mac_address(node);
-       if (!maddr)
-               eth_hw_addr_random(netdev);
-       else
+       if (device_get_mac_address(&pdev->dev, maddr, ETH_ALEN))
                ether_addr_copy(netdev->dev_addr, maddr);
+       else
+               eth_hw_addr_random(netdev);
 
        /* Core 0 interrupt */
        ret = platform_get_irq(pdev, 0);