aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-12-09 22:51:09 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-10 22:31:32 -0500
commit40706af0b246f416a35fc3e12dc695deca8da3ff (patch)
treef3330a979187c46683ac19e285980a8bcab97122
parent6d4bebebe20e18c565143b8852c0f5bd50a64f34 (diff)
net: ieee802154: remove unnecessary spi_set_drvdata()
The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ieee802154/at86rf230.c2
-rw-r--r--drivers/net/ieee802154/mrf24j40.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 2cbe1c249996..ab31544bc254 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -987,7 +987,6 @@ err_gpio_dir:
987err_slp_tr: 987err_slp_tr:
988 gpio_free(lp->rstn); 988 gpio_free(lp->rstn);
989err_rstn: 989err_rstn:
990 spi_set_drvdata(spi, NULL);
991 mutex_destroy(&lp->bmux); 990 mutex_destroy(&lp->bmux);
992 ieee802154_free_device(lp->dev); 991 ieee802154_free_device(lp->dev);
993 return rc; 992 return rc;
@@ -1006,7 +1005,6 @@ static int at86rf230_remove(struct spi_device *spi)
1006 gpio_free(lp->slp_tr); 1005 gpio_free(lp->slp_tr);
1007 gpio_free(lp->rstn); 1006 gpio_free(lp->rstn);
1008 1007
1009 spi_set_drvdata(spi, NULL);
1010 mutex_destroy(&lp->bmux); 1008 mutex_destroy(&lp->bmux);
1011 ieee802154_free_device(lp->dev); 1009 ieee802154_free_device(lp->dev);
1012 1010
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index c6e46d6e9f75..246befa4ba05 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -715,7 +715,6 @@ static int mrf24j40_remove(struct spi_device *spi)
715 * complete? */ 715 * complete? */
716 716
717 /* Clean up the SPI stuff. */ 717 /* Clean up the SPI stuff. */
718 spi_set_drvdata(spi, NULL);
719 kfree(devrec->buf); 718 kfree(devrec->buf);
720 kfree(devrec); 719 kfree(devrec);
721 return 0; 720 return 0;