Skip to content

Commit

Permalink
net: ethernet: ks8851: use spi_get_drvdata() and spi_set_drvdata()
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Jingoo Han authored and davem330 committed Apr 7, 2013
1 parent fce5c29 commit 8f99660
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/ethernet/micrel/ks8851.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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)) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1516,7 +1516,7 @@ static int ks8851_probe(struct spi_device *spi)

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");
Expand Down

0 comments on commit 8f99660

Please sign in to comment.