diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-03-19 20:49:18 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-19 14:59:31 -0700 |
| commit | 9b525171d881e6c502401ce9056e667302db2f88 (patch) | |
| tree | 36be97d1993f7f6ac697a0ff4812421bb27da286 /drivers/net/ethernet | |
| parent | ipv6: Add icmp_echo_ignore_multicast support for ICMPv6 (diff) | |
| download | linux-dev-9b525171d881e6c502401ce9056e667302db2f88.tar.xz linux-dev-9b525171d881e6c502401ce9056e667302db2f88.zip | |
enc28j60: Use device_get_mac_address()
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/microchip/enc28j60.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c index 8f72587b5a2c..559f62ef2598 100644 --- a/drivers/net/ethernet/microchip/enc28j60.c +++ b/drivers/net/ethernet/microchip/enc28j60.c @@ -18,6 +18,7 @@ #include <linux/types.h> #include <linux/fcntl.h> #include <linux/interrupt.h> +#include <linux/property.h> #include <linux/string.h> #include <linux/errno.h> #include <linux/init.h> @@ -28,7 +29,6 @@ #include <linux/skbuff.h> #include <linux/delay.h> #include <linux/spi/spi.h> -#include <linux/of_net.h> #include "enc28j60_hw.h" @@ -1552,9 +1552,9 @@ static const struct net_device_ops enc28j60_netdev_ops = { static int enc28j60_probe(struct spi_device *spi) { + unsigned char macaddr[ETH_ALEN]; struct net_device *dev; struct enc28j60_net *priv; - const void *macaddr; int ret = 0; if (netif_msg_drv(&debug)) @@ -1587,8 +1587,7 @@ static int enc28j60_probe(struct spi_device *spi) goto error_irq; } - macaddr = of_get_mac_address(spi->dev.of_node); - if (macaddr) + if (device_get_mac_address(&spi->dev, macaddr, sizeof(macaddr))) ether_addr_copy(dev->dev_addr, macaddr); else eth_hw_addr_random(dev); |