From fa727bc3766f793c7d5cbff9e9c25824a0246caa Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Fri, 5 Apr 2013 20:36:11 +0000 Subject: [PATCH] --- yaml --- r: 368887 b: refs/heads/master c: 5743756161518f279ad0bd21437713f7bc3f0a81 h: refs/heads/master i: 368885: 306e6d16bc8420e2b94fd179b28d57b9ffca12cc 368883: be6d8616246ab700913fdc0d6b74a367f2e4f7a4 368879: 79f0eab743c3e4590b774af43637923a424bb451 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/microchip/enc28j60.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 22ed1f94e6ea..ec1a6c24421d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f996607824dba3c808bb7ed3f8f82670120383e +refs/heads/master: 5743756161518f279ad0bd21437713f7bc3f0a81 diff --git a/trunk/drivers/net/ethernet/microchip/enc28j60.c b/trunk/drivers/net/ethernet/microchip/enc28j60.c index 5d98a9f7bfc7..c7b40aa21f22 100644 --- a/trunk/drivers/net/ethernet/microchip/enc28j60.c +++ b/trunk/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 @@ static int enc28j60_probe(struct spi_device *spi) 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");