From 4fa0a0ef292a416210018a1074c7b5056773d649 Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Fri, 5 Apr 2013 20:34:18 +0000 Subject: [PATCH] net: ieee802154: mrf24j40: 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 --- drivers/net/ieee802154/mrf24j40.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 0ca8f88..ca00351 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -648,7 +648,7 @@ static int mrf24j40_probe(struct spi_device *spi) init_completion(&devrec->tx_complete); INIT_WORK(&devrec->irqwork, mrf24j40_isrwork); devrec->spi = spi; - dev_set_drvdata(&spi->dev, devrec); + spi_set_drvdata(spi, devrec); /* Register with the 802154 subsystem */ @@ -720,7 +720,7 @@ err_devrec: static int mrf24j40_remove(struct spi_device *spi) { - struct mrf24j40 *devrec = dev_get_drvdata(&spi->dev); + struct mrf24j40 *devrec = spi_get_drvdata(spi); dev_dbg(printdev(devrec), "remove\n"); @@ -732,7 +732,7 @@ static int mrf24j40_remove(struct spi_device *spi) * complete? */ /* Clean up the SPI stuff. */ - dev_set_drvdata(&spi->dev, NULL); + spi_set_drvdata(spi, NULL); kfree(devrec->buf); kfree(devrec); return 0; -- 2.7.4