i2c: pmcmsp: make use of the new infrastructure for quirks

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index d37d9db..2c40edb 100644 (file)
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -456,14 +456,6 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
                return -EINVAL;
        }
 
-       if (cmd->read_len > MSP_MAX_BYTES_PER_RW ||
-           cmd->write_len > MSP_MAX_BYTES_PER_RW) {
-               dev_err(&pmcmsptwi_adapter.dev,
-                       "%s: Cannot transfer more than %d bytes\n",
-                       __func__, MSP_MAX_BYTES_PER_RW);
-               return -EINVAL;
-       }
-
        mutex_lock(&data->lock);
        dev_dbg(&pmcmsptwi_adapter.dev,
                "Setting address to 0x%04x\n", cmd->addr);
@@ -520,25 +512,14 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,
        struct pmcmsptwi_cfg oldcfg, newcfg;
        int ret;
 
-       if (num > 2) {
-               dev_dbg(&adap->dev, "%d messages unsupported\n", num);
-               return -EINVAL;
-       } else if (num == 2) {
-               /* Check for a dual write-then-read command */
+       if (num == 2) {
                struct i2c_msg *nextmsg = msg + 1;
-               if (!(msg->flags & I2C_M_RD) &&
-                   (nextmsg->flags & I2C_M_RD) &&
-                   msg->addr == nextmsg->addr) {
-                       cmd.type = MSP_TWI_CMD_WRITE_READ;
-                       cmd.write_len = msg->len;
-                       cmd.write_data = msg->buf;
-                       cmd.read_len = nextmsg->len;
-                       cmd.read_data = nextmsg->buf;
-               } else {
-                       dev_dbg(&adap->dev,
-                               "Non write-read dual messages unsupported\n");
-                       return -EINVAL;
-               }
+
+               cmd.type = MSP_TWI_CMD_WRITE_READ;
+               cmd.write_len = msg->len;
+               cmd.write_data = msg->buf;
+               cmd.read_len = nextmsg->len;
+               cmd.read_data = nextmsg->buf;
        } else if (msg->flags & I2C_M_RD) {
                cmd.type = MSP_TWI_CMD_READ;
                cmd.read_len = msg->len;
@@ -598,6 +579,14 @@ static u32 pmcmsptwi_i2c_func(struct i2c_adapter *adapter)
                I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_PROC_CALL;
 }
 
+static struct i2c_adapter_quirks pmcmsptwi_i2c_quirks = {
+       .flags = I2C_AQ_COMB_WRITE_THEN_READ,
+       .max_write_len = MSP_MAX_BYTES_PER_RW,
+       .max_read_len = MSP_MAX_BYTES_PER_RW,
+       .max_comb_1st_msg_len = MSP_MAX_BYTES_PER_RW,
+       .max_comb_2nd_msg_len = MSP_MAX_BYTES_PER_RW,
+};
+
 /* -- Initialization -- */
 
 static struct i2c_algorithm pmcmsptwi_algo = {
@@ -609,6 +598,7 @@ static struct i2c_adapter pmcmsptwi_adapter = {
        .owner          = THIS_MODULE,
        .class          = I2C_CLASS_HWMON | I2C_CLASS_SPD,
        .algo           = &pmcmsptwi_algo,
+       .quirks         = &pmcmsptwi_i2c_quirks,
        .name           = DRV_NAME,
 };