Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / microchip / enc28j60.c

diff --git a/drivers/net/ethernet/microchip/enc28j60.c b/drivers/net/ethernet/microchip/enc28j60.c
index 5d98a9f7bfc7071b63b9796ec59166b9027972b0..c7b40aa21f22fe2a909754fe4e2a9a7b8bad5898 100644 (file)
--- a/drivers/net/ethernet/microchip/enc28j60.c
+++ b/drivers/net/ethernet/microchip/enc28j60.c
@@ -1566,7 +1566,7 @@ static int enc28j60_probe(struct spi_device *spi)
        INIT_WORK(&priv->setrx_work, enc28j60_setrx_work_handler);
        INIT_WORK(&priv->irq_work, enc28j60_irq_work_handler);
        INIT_WORK(&priv->restart_work, enc28j60_restart_work_handler);
-       dev_set_drvdata(&spi->dev, priv);       /* spi to priv reference */
+       spi_set_drvdata(spi, priv);     /* spi to priv reference */
        SET_NETDEV_DEV(dev, &spi->dev);
 
        if (!enc28j60_chipset_init(dev)) {
@@ -1618,7 +1618,7 @@ error_alloc:
 
 static int enc28j60_remove(struct spi_device *spi)
 {
-       struct enc28j60_net *priv = dev_get_drvdata(&spi->dev);
+       struct enc28j60_net *priv = spi_get_drvdata(spi);
 
        if (netif_msg_drv(priv))
                printk(KERN_DEBUG DRV_NAME ": remove\n");