aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-omap.c
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2013-02-15 08:18:35 -0500
committerWolfram Sang <wolfram@the-dreams.de>2013-02-21 18:25:50 -0500
commit55827f4aa6442ddd1d6a4e1e32f2f457eb113c22 (patch)
tree5fb9f31a58c05d678694d8102fed07b4d45bb14f /drivers/i2c/busses/i2c-omap.c
parent0a6d2246790512c88931ddbfedf3fd48e0979093 (diff)
i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls
There is simply no reason to be manually setting the private driver data to NULL in the remove/fail to probe cases. This is just extra cruft code that can be removed. A few notes: * Nothing relies on drvdata being set to NULL. * The __device_release_driver() function eventually calls dev_set_drvdata(dev, NULL) anyway, so there's no need to do it twice. * I verified that there were no cases where xxx_get_drvdata() was being called in these drivers and checking for / relying on the NULL return value. This could be cleaned up kernel-wide but for now just take the baby step and remove from the i2c subsystem. Reported-by: Wolfram Sang <wsa@the-dreams.de> Reported-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Doug Anderson <dianders@chromium.org> Reviewed-by: Jean Delvare <khali@linux-fr.org> Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Reviewed-by: Marek Vasut <marex@denx.de> Signed-off-by: Wolfram Sang <wolfram@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-omap.c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 4cc2f0528c88..79d05128c77e 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -1262,7 +1262,6 @@ err_unuse_clocks:
1262 pm_runtime_put(dev->dev); 1262 pm_runtime_put(dev->dev);
1263 pm_runtime_disable(&pdev->dev); 1263 pm_runtime_disable(&pdev->dev);
1264err_free_mem: 1264err_free_mem:
1265 platform_set_drvdata(pdev, NULL);
1266 1265
1267 return r; 1266 return r;
1268} 1267}
@@ -1272,8 +1271,6 @@ static int omap_i2c_remove(struct platform_device *pdev)
1272 struct omap_i2c_dev *dev = platform_get_drvdata(pdev); 1271 struct omap_i2c_dev *dev = platform_get_drvdata(pdev);
1273 int ret; 1272 int ret;
1274 1273
1275 platform_set_drvdata(pdev, NULL);
1276
1277 i2c_del_adapter(&dev->adapter); 1274 i2c_del_adapter(&dev->adapter);
1278 ret = pm_runtime_get_sync(&pdev->dev); 1275 ret = pm_runtime_get_sync(&pdev->dev);
1279 if (IS_ERR_VALUE(ret)) 1276 if (IS_ERR_VALUE(ret))