diff options
author | Doug Anderson <dianders@chromium.org> | 2013-02-15 08:18:35 -0500 |
---|---|---|
committer | Wolfram Sang <wolfram@the-dreams.de> | 2013-02-21 18:25:50 -0500 |
commit | 55827f4aa6442ddd1d6a4e1e32f2f457eb113c22 (patch) | |
tree | 5fb9f31a58c05d678694d8102fed07b4d45bb14f /drivers/i2c/busses/i2c-puv3.c | |
parent | 0a6d2246790512c88931ddbfedf3fd48e0979093 (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-puv3.c')
-rw-r--r-- | drivers/i2c/busses/i2c-puv3.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c index d7c512d717a7..261d7db437e2 100644 --- a/drivers/i2c/busses/i2c-puv3.c +++ b/drivers/i2c/busses/i2c-puv3.c | |||
@@ -223,7 +223,6 @@ static int puv3_i2c_probe(struct platform_device *pdev) | |||
223 | return 0; | 223 | return 0; |
224 | 224 | ||
225 | fail_add_adapter: | 225 | fail_add_adapter: |
226 | platform_set_drvdata(pdev, NULL); | ||
227 | kfree(adapter); | 226 | kfree(adapter); |
228 | fail_nomem: | 227 | fail_nomem: |
229 | release_mem_region(mem->start, resource_size(mem)); | 228 | release_mem_region(mem->start, resource_size(mem)); |
@@ -245,7 +244,6 @@ static int puv3_i2c_remove(struct platform_device *pdev) | |||
245 | } | 244 | } |
246 | 245 | ||
247 | put_device(&pdev->dev); | 246 | put_device(&pdev->dev); |
248 | platform_set_drvdata(pdev, NULL); | ||
249 | 247 | ||
250 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 248 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
251 | release_mem_region(mem->start, resource_size(mem)); | 249 | release_mem_region(mem->start, resource_size(mem)); |