From: Lars-Peter Clausen Date: Sat, 9 Mar 2013 08:16:48 +0000 (+0000) Subject: i2c: Ignore the return value of i2c_del_mux_adapter() X-Git-Tag: v3.10-rc1~117^2~21 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a205e63d12716bd871b6a5746b6b624c5965a059;p=profile%2Fivi%2Fkernel-x86-ivi.git i2c: Ignore the return value of i2c_del_mux_adapter() i2c_del_mux_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 its return value and assume that it will always succeed (which it will). A subsequent patch will make the return type of i2c_del_mux_adapter() void. Signed-off-by: Lars-Peter Clausen Acked-by: Guenter Roeck Reviewed-by: Jean Delvare Signed-off-by: Wolfram Sang --- diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 8e43872..a531d80 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -262,13 +262,11 @@ static int pca954x_remove(struct i2c_client *client) { struct pca954x *data = i2c_get_clientdata(client); const struct chip_desc *chip = &chips[data->type]; - int i, err; + int i; for (i = 0; i < chip->nchans; ++i) if (data->virt_adaps[i]) { - err = i2c_del_mux_adapter(data->virt_adaps[i]); - if (err) - return err; + i2c_del_mux_adapter(data->virt_adaps[i]); data->virt_adaps[i] = NULL; }