i2c: Ignore the return value of i2c_del_mux_adapter()
authorLars-Peter Clausen <lars@metafoo.de>
Sat, 9 Mar 2013 08:16:48 +0000 (08:16 +0000)
committerWolfram Sang <wsa@the-dreams.de>
Tue, 2 Apr 2013 05:07:29 +0000 (07:07 +0200)
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 <lars@metafoo.de>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/muxes/i2c-mux-pca954x.c

index 8e4387235b697eeeed46a8db77a2bf683e09d84f..a531d801dbe47aa8a35461955a57e7320380e9fc 100644 (file)
@@ -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;
                }