aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/micrel
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-04-05 16:35:43 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-07 16:48:18 -0400
commit8f996607824dba3c808bb7ed3f8f82670120383e (patch)
treea4863bee65163e8729488f9843f619e25b0835cd /drivers/net/ethernet/micrel
parentfce5c293ff4462cee4e7090ed1763c414cc7d8bb (diff)
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 <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel')
-rw-r--r--drivers/net/ethernet/micrel/ks8851.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c
index 8fb481252e2c..4a3b4995f19a 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)
1367#ifdef CONFIG_PM 1367#ifdef CONFIG_PM
1368static int ks8851_suspend(struct spi_device *spi, pm_message_t state) 1368static int ks8851_suspend(struct spi_device *spi, pm_message_t state)
1369{ 1369{
1370 struct ks8851_net *ks = dev_get_drvdata(&spi->dev); 1370 struct ks8851_net *ks = spi_get_drvdata(spi);
1371 struct net_device *dev = ks->netdev; 1371 struct net_device *dev = ks->netdev;
1372 1372
1373 if (netif_running(dev)) { 1373 if (netif_running(dev)) {
@@ -1380,7 +1380,7 @@ static int ks8851_suspend(struct spi_device *spi, pm_message_t state)
1380 1380
1381static int ks8851_resume(struct spi_device *spi) 1381static int ks8851_resume(struct spi_device *spi)
1382{ 1382{
1383 struct ks8851_net *ks = dev_get_drvdata(&spi->dev); 1383 struct ks8851_net *ks = spi_get_drvdata(spi);
1384 struct net_device *dev = ks->netdev; 1384 struct net_device *dev = ks->netdev;
1385 1385
1386 if (netif_running(dev)) { 1386 if (netif_running(dev)) {
@@ -1456,7 +1456,7 @@ static int ks8851_probe(struct spi_device *spi)
1456 SET_ETHTOOL_OPS(ndev, &ks8851_ethtool_ops); 1456 SET_ETHTOOL_OPS(ndev, &ks8851_ethtool_ops);
1457 SET_NETDEV_DEV(ndev, &spi->dev); 1457 SET_NETDEV_DEV(ndev, &spi->dev);
1458 1458
1459 dev_set_drvdata(&spi->dev, ks); 1459 spi_set_drvdata(spi, ks);
1460 1460
1461 ndev->if_port = IF_PORT_100BASET; 1461 ndev->if_port = IF_PORT_100BASET;
1462 ndev->netdev_ops = &ks8851_netdev_ops; 1462 ndev->netdev_ops = &ks8851_netdev_ops;
@@ -1516,7 +1516,7 @@ err_irq:
1516 1516
1517static int ks8851_remove(struct spi_device *spi) 1517static int ks8851_remove(struct spi_device *spi)
1518{ 1518{
1519 struct ks8851_net *priv = dev_get_drvdata(&spi->dev); 1519 struct ks8851_net *priv = spi_get_drvdata(spi);
1520 1520
1521 if (netif_msg_drv(priv)) 1521 if (netif_msg_drv(priv))
1522 dev_info(&spi->dev, "remove\n"); 1522 dev_info(&spi->dev, "remove\n");