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-octeon.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-octeon.c')
-rw-r--r-- | drivers/i2c/busses/i2c-octeon.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c index 484ca771fdff..935585ef4d39 100644 --- a/drivers/i2c/busses/i2c-octeon.c +++ b/drivers/i2c/busses/i2c-octeon.c | |||
@@ -595,7 +595,7 @@ static int octeon_i2c_probe(struct platform_device *pdev) | |||
595 | result = i2c_add_adapter(&i2c->adap); | 595 | result = i2c_add_adapter(&i2c->adap); |
596 | if (result < 0) { | 596 | if (result < 0) { |
597 | dev_err(i2c->dev, "failed to add adapter\n"); | 597 | dev_err(i2c->dev, "failed to add adapter\n"); |
598 | goto fail_add; | 598 | goto out; |
599 | } | 599 | } |
600 | dev_info(i2c->dev, "version %s\n", DRV_VERSION); | 600 | dev_info(i2c->dev, "version %s\n", DRV_VERSION); |
601 | 601 | ||
@@ -603,8 +603,6 @@ static int octeon_i2c_probe(struct platform_device *pdev) | |||
603 | 603 | ||
604 | return 0; | 604 | return 0; |
605 | 605 | ||
606 | fail_add: | ||
607 | platform_set_drvdata(pdev, NULL); | ||
608 | out: | 606 | out: |
609 | return result; | 607 | return result; |
610 | }; | 608 | }; |
@@ -614,7 +612,6 @@ static int octeon_i2c_remove(struct platform_device *pdev) | |||
614 | struct octeon_i2c *i2c = platform_get_drvdata(pdev); | 612 | struct octeon_i2c *i2c = platform_get_drvdata(pdev); |
615 | 613 | ||
616 | i2c_del_adapter(&i2c->adap); | 614 | i2c_del_adapter(&i2c->adap); |
617 | platform_set_drvdata(pdev, NULL); | ||
618 | return 0; | 615 | return 0; |
619 | }; | 616 | }; |
620 | 617 | ||