From: Jingoo Han Date: Fri, 5 Apr 2013 20:35:43 +0000 (+0000) Subject: net: ethernet: ks8851: use spi_get_drvdata() and spi_set_drvdata() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f996607824dba3c808bb7ed3f8f82670120383e;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git net: ethernet: ks8851: use spi_get_drvdata() and spi_set_drvdata() Use the wrapper functions for getting and setting the driver data using spi_device instead of using dev_{get|set}_drvdata with &spi->dev, so we can directly pass a struct spi_device. Signed-off-by: Jingoo Han Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index 8fb481252e2..4a3b4995f19 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -1367,7 +1367,7 @@ static int ks8851_read_selftest(struct ks8851_net *ks) #ifdef CONFIG_PM static int ks8851_suspend(struct spi_device *spi, pm_message_t state) { - struct ks8851_net *ks = dev_get_drvdata(&spi->dev); + struct ks8851_net *ks = spi_get_drvdata(spi); struct net_device *dev = ks->netdev; if (netif_running(dev)) { @@ -1380,7 +1380,7 @@ static int ks8851_suspend(struct spi_device *spi, pm_message_t state) static int ks8851_resume(struct spi_device *spi) { - struct ks8851_net *ks = dev_get_drvdata(&spi->dev); + struct ks8851_net *ks = spi_get_drvdata(spi); struct net_device *dev = ks->netdev; if (netif_running(dev)) { @@ -1456,7 +1456,7 @@ static int ks8851_probe(struct spi_device *spi) SET_ETHTOOL_OPS(ndev, &ks8851_ethtool_ops); SET_NETDEV_DEV(ndev, &spi->dev); - dev_set_drvdata(&spi->dev, ks); + spi_set_drvdata(spi, ks); ndev->if_port = IF_PORT_100BASET; ndev->netdev_ops = &ks8851_netdev_ops; @@ -1516,7 +1516,7 @@ err_irq: static int ks8851_remove(struct spi_device *spi) { - struct ks8851_net *priv = dev_get_drvdata(&spi->dev); + struct ks8851_net *priv = spi_get_drvdata(spi); if (netif_msg_drv(priv)) dev_info(&spi->dev, "remove\n");