|
@@ -1132,10 +1132,6 @@ static int ethoc_probe(struct platform_device *pdev)
|
|
memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN);
|
|
memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN);
|
|
priv->phy_id = pdata->phy_id;
|
|
priv->phy_id = pdata->phy_id;
|
|
} else {
|
|
} else {
|
|
- priv->phy_id = -1;
|
|
|
|
-
|
|
|
|
-#ifdef CONFIG_OF
|
|
|
|
- {
|
|
|
|
const uint8_t *mac;
|
|
const uint8_t *mac;
|
|
|
|
|
|
mac = of_get_property(pdev->dev.of_node,
|
|
mac = of_get_property(pdev->dev.of_node,
|
|
@@ -1143,8 +1139,7 @@ static int ethoc_probe(struct platform_device *pdev)
|
|
NULL);
|
|
NULL);
|
|
if (mac)
|
|
if (mac)
|
|
memcpy(netdev->dev_addr, mac, IFHWADDRLEN);
|
|
memcpy(netdev->dev_addr, mac, IFHWADDRLEN);
|
|
- }
|
|
|
|
-#endif
|
|
|
|
|
|
+ priv->phy_id = -1;
|
|
}
|
|
}
|
|
|
|
|
|
/* Check that the given MAC address is valid. If it isn't, read the
|
|
/* Check that the given MAC address is valid. If it isn't, read the
|