OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: ethoc: Remove unnecessary #ifdef CONFIG_OF
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
net
/
ethernet
/
ethoc.c
diff --git
a/drivers/net/ethernet/ethoc.c
b/drivers/net/ethernet/ethoc.c
index
442410c
..
a2c96fd
100644
(file)
--- a/
drivers/net/ethernet/ethoc.c
+++ b/
drivers/net/ethernet/ethoc.c
@@
-1132,10
+1132,6
@@
static int ethoc_probe(struct platform_device *pdev)
memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN);
priv->phy_id = pdata->phy_id;
} else {
memcpy(netdev->dev_addr, pdata->hwaddr, IFHWADDRLEN);
priv->phy_id = pdata->phy_id;
} else {
- priv->phy_id = -1;
-
-#ifdef CONFIG_OF
- {
const uint8_t *mac;
mac = of_get_property(pdev->dev.of_node,
const uint8_t *mac;
mac = of_get_property(pdev->dev.of_node,
@@
-1143,8
+1139,7
@@
static int ethoc_probe(struct platform_device *pdev)
NULL);
if (mac)
memcpy(netdev->dev_addr, mac, IFHWADDRLEN);
NULL);
if (mac)
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