Merge tag 'printk-for-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...

[linux-2.6-microblaze.git] / drivers / net / ethernet / qualcomm / qca_spi.c

diff --git a/drivers/net/ethernet/qualcomm/qca_spi.c b/drivers/net/ethernet/qualcomm/qca_spi.c
index 8427fe1..3c5494a 100644 (file)
--- a/drivers/net/ethernet/qualcomm/qca_spi.c
+++ b/drivers/net/ethernet/qualcomm/qca_spi.c
@@ -968,7 +968,7 @@ qca_spi_probe(struct spi_device *spi)
 
        spi_set_drvdata(spi, qcaspi_devs);
 
-       ret = of_get_mac_address(spi->dev.of_node, qca->net_dev->dev_addr);
+       ret = of_get_ethdev_address(spi->dev.of_node, qca->net_dev);
        if (ret) {
                eth_hw_addr_random(qca->net_dev);
                dev_info(&spi->dev, "Using random MAC address: %pM\n",
@@ -1001,7 +1001,7 @@ qca_spi_probe(struct spi_device *spi)
        return 0;
 }
 
-static int
+static void
 qca_spi_remove(struct spi_device *spi)
 {
        struct net_device *qcaspi_devs = spi_get_drvdata(spi);
@@ -1011,8 +1011,6 @@ qca_spi_remove(struct spi_device *spi)
 
        unregister_netdev(qcaspi_devs);
        free_netdev(qcaspi_devs);
-
-       return 0;
 }
 
 static const struct spi_device_id qca_spi_id[] = {