summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/devices/mtd_dataflash.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-11-25 04:24:22 +0100
committerBrian Norris <computersforpeace@gmail.com>2014-01-03 20:22:20 +0100
commit1ba80c9e08a6d17ac495d8e6a1acd3d0f6a7971b (patch)
treed2f0c7d32b8c15d8ab445c2b2e3ab7d01ab253e7 /drivers/mtd/devices/mtd_dataflash.c
parentmtd: mpc5121_nfc: drop devm_free_irq of devm_ allocated irq (diff)
downloadlinux-1ba80c9e08a6d17ac495d8e6a1acd3d0f6a7971b.tar.xz
linux-1ba80c9e08a6d17ac495d8e6a1acd3d0f6a7971b.zip
mtd: dataflash: 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: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/devices/mtd_dataflash.c')
-rw-r--r--drivers/mtd/devices/mtd_dataflash.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 4a47b0266d4e..624069de4f28 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -669,7 +669,6 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
if (!err)
return 0;
- spi_set_drvdata(spi, NULL);
kfree(priv);
return err;
}
@@ -899,10 +898,8 @@ static int dataflash_remove(struct spi_device *spi)
pr_debug("%s: remove\n", dev_name(&spi->dev));
status = mtd_device_unregister(&flash->mtd);
- if (status == 0) {
- spi_set_drvdata(spi, NULL);
+ if (status == 0)
kfree(flash);
- }
return status;
}