diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2013-03-09 08:16:46 +0000 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2013-04-02 07:06:03 +0200 |
| commit | bf51a8c5e0b6133b929eb7d7456e99a605f8168c (patch) | |
| tree | 5b592f4c92618ae074af18afee0ff1ad269177d3 /drivers/i2c/busses/i2c-mxs.c | |
| parent | i2c: i2c_del_adapter: Don't treat removing a non-registered adapter as error (diff) | |
| download | linux-dev-bf51a8c5e0b6133b929eb7d7456e99a605f8168c.tar.xz linux-dev-bf51a8c5e0b6133b929eb7d7456e99a605f8168c.zip | |
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-mxs.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mxs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index 120f24646696..804eb6b0a0b8 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -686,11 +686,8 @@ static int mxs_i2c_probe(struct platform_device *pdev) static int mxs_i2c_remove(struct platform_device *pdev) { struct mxs_i2c_dev *i2c = platform_get_drvdata(pdev); - int ret; - ret = i2c_del_adapter(&i2c->adapter); - if (ret) - return -EBUSY; + i2c_del_adapter(&i2c->adapter); if (i2c->dmach) dma_release_channel(i2c->dmach); |