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-mpc.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-mpc.c')
-rw-r--r-- | drivers/i2c/busses/i2c-mpc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index a69459e5c3f3..5e705ee02f4a 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
@@ -696,7 +696,6 @@ static int fsl_i2c_probe(struct platform_device *op) | |||
696 | return result; | 696 | return result; |
697 | 697 | ||
698 | fail_add: | 698 | fail_add: |
699 | dev_set_drvdata(&op->dev, NULL); | ||
700 | free_irq(i2c->irq, i2c); | 699 | free_irq(i2c->irq, i2c); |
701 | fail_request: | 700 | fail_request: |
702 | irq_dispose_mapping(i2c->irq); | 701 | irq_dispose_mapping(i2c->irq); |
@@ -711,7 +710,6 @@ static int fsl_i2c_remove(struct platform_device *op) | |||
711 | struct mpc_i2c *i2c = dev_get_drvdata(&op->dev); | 710 | struct mpc_i2c *i2c = dev_get_drvdata(&op->dev); |
712 | 711 | ||
713 | i2c_del_adapter(&i2c->adap); | 712 | i2c_del_adapter(&i2c->adap); |
714 | dev_set_drvdata(&op->dev, NULL); | ||
715 | 713 | ||
716 | if (i2c->irq) | 714 | if (i2c->irq) |
717 | free_irq(i2c->irq, i2c); | 715 | free_irq(i2c->irq, i2c); |