Commit fb3de30c authored by Wolfram Sang's avatar Wolfram Sang

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

Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent f2325c54
...@@ -456,14 +456,6 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd( ...@@ -456,14 +456,6 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
return -EINVAL; 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); mutex_lock(&data->lock);
dev_dbg(&pmcmsptwi_adapter.dev, dev_dbg(&pmcmsptwi_adapter.dev,
"Setting address to 0x%04x\n", cmd->addr); "Setting address to 0x%04x\n", cmd->addr);
...@@ -520,25 +512,14 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap, ...@@ -520,25 +512,14 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,
struct pmcmsptwi_cfg oldcfg, newcfg; struct pmcmsptwi_cfg oldcfg, newcfg;
int ret; int ret;
if (num > 2) { 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 */
struct i2c_msg *nextmsg = msg + 1; struct i2c_msg *nextmsg = msg + 1;
if (!(msg->flags & I2C_M_RD) &&
(nextmsg->flags & I2C_M_RD) && cmd.type = MSP_TWI_CMD_WRITE_READ;
msg->addr == nextmsg->addr) { cmd.write_len = msg->len;
cmd.type = MSP_TWI_CMD_WRITE_READ; cmd.write_data = msg->buf;
cmd.write_len = msg->len; cmd.read_len = nextmsg->len;
cmd.write_data = msg->buf; cmd.read_data = nextmsg->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;
}
} else if (msg->flags & I2C_M_RD) { } else if (msg->flags & I2C_M_RD) {
cmd.type = MSP_TWI_CMD_READ; cmd.type = MSP_TWI_CMD_READ;
cmd.read_len = msg->len; cmd.read_len = msg->len;
...@@ -598,6 +579,14 @@ static u32 pmcmsptwi_i2c_func(struct i2c_adapter *adapter) ...@@ -598,6 +579,14 @@ static u32 pmcmsptwi_i2c_func(struct i2c_adapter *adapter)
I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_PROC_CALL; 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 -- */ /* -- Initialization -- */
static struct i2c_algorithm pmcmsptwi_algo = { static struct i2c_algorithm pmcmsptwi_algo = {
...@@ -609,6 +598,7 @@ static struct i2c_adapter pmcmsptwi_adapter = { ...@@ -609,6 +598,7 @@ static struct i2c_adapter pmcmsptwi_adapter = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.class = I2C_CLASS_HWMON | I2C_CLASS_SPD, .class = I2C_CLASS_HWMON | I2C_CLASS_SPD,
.algo = &pmcmsptwi_algo, .algo = &pmcmsptwi_algo,
.quirks = &pmcmsptwi_i2c_quirks,
.name = DRV_NAME, .name = DRV_NAME,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment