diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2013-03-09 03:16:46 -0500 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2013-04-02 01:06:03 -0400 |
commit | bf51a8c5e0b6133b929eb7d7456e99a605f8168c (patch) | |
tree | 5b592f4c92618ae074af18afee0ff1ad269177d3 /drivers/i2c/busses/i2c-puv3.c | |
parent | f5fb0822957b914ab7022cc4bfe000ec3bc9c82c (diff) |
i2c: Ignore return value of i2c_del_adapter()
i2c_del_adapter() always returns 0. So all checks testing whether it will be
non zero will always evaluate to false and the conditional code is dead code.
This patch updates all callers of i2c_del_mux_adapter() to ignore the return
value and assume that it will always succeed (which it will). In a subsequent
patch the return type of i2c_del_adapter() will be made void.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-puv3.c')
-rw-r--r-- | drivers/i2c/busses/i2c-puv3.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c index 261d7db437e2..4fd47bcd1108 100644 --- a/drivers/i2c/busses/i2c-puv3.c +++ b/drivers/i2c/busses/i2c-puv3.c | |||
@@ -234,21 +234,15 @@ static int puv3_i2c_remove(struct platform_device *pdev) | |||
234 | { | 234 | { |
235 | struct i2c_adapter *adapter = platform_get_drvdata(pdev); | 235 | struct i2c_adapter *adapter = platform_get_drvdata(pdev); |
236 | struct resource *mem; | 236 | struct resource *mem; |
237 | int rc; | ||
238 | 237 | ||
239 | rc = i2c_del_adapter(adapter); | 238 | i2c_del_adapter(adapter); |
240 | if (rc) { | ||
241 | dev_err(&pdev->dev, "Adapter '%s' delete fail\n", | ||
242 | adapter->name); | ||
243 | return rc; | ||
244 | } | ||
245 | 239 | ||
246 | put_device(&pdev->dev); | 240 | put_device(&pdev->dev); |
247 | 241 | ||
248 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 242 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
249 | release_mem_region(mem->start, resource_size(mem)); | 243 | release_mem_region(mem->start, resource_size(mem)); |
250 | 244 | ||
251 | return rc; | 245 | return 0; |
252 | } | 246 | } |
253 | 247 | ||
254 | #ifdef CONFIG_PM | 248 | #ifdef CONFIG_PM |