i2c: mux: mlxcpld: make use of __i2c_smbus_xfer

This simplifies the code, and you get retries for free if the adapter
does not support ->master_xfer.

Signed-off-by: Peter Rosin <peda@axentia.se>
Acked-by: Michael Shych <michaelsh@mellanox.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/muxes/i2c-mux-mlxcpld.c b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
index 12ad8d6..f2bf3e5 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-mlxcpld.c
+++ b/drivers/i2c/muxes/i2c-mux-mlxcpld.c
@@ -94,31 +94,11 @@ static int mlxcpld_mux_reg_write(struct i2c_adapter *adap,
                                 struct i2c_client *client, u8 val)
 {
        struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&client->dev);
-       int ret = -ENODEV;
-
-       if (adap->algo->master_xfer) {
-               struct i2c_msg msg;
-               u8 msgbuf[] = {pdata->sel_reg_addr, val};
-
-               msg.addr = client->addr;
-               msg.flags = 0;
-               msg.len = 2;
-               msg.buf = msgbuf;
-               ret = __i2c_transfer(adap, &msg, 1);
-
-               if (ret >= 0 && ret != 1)
-                       ret = -EREMOTEIO;
-       } else if (adap->algo->smbus_xfer) {
-               union i2c_smbus_data data;
-
-               data.byte = val;
-               ret = adap->algo->smbus_xfer(adap, client->addr,
-                                            client->flags, I2C_SMBUS_WRITE,
-                                            pdata->sel_reg_addr,
-                                            I2C_SMBUS_BYTE_DATA, &data);
-       }
+       union i2c_smbus_data data = { .byte = val };
 
-       return ret;
+       return __i2c_smbus_xfer(adap, client->addr, client->flags,
+                               I2C_SMBUS_WRITE, pdata->sel_reg_addr,
+                               I2C_SMBUS_BYTE_DATA, &data);
 }
 
 static int mlxcpld_mux_select_chan(struct i2c_mux_core *muxc, u32 chan)