Commit cf0d0739 authored by Michael Welling's avatar Michael Welling Committed by Jonathan Cameron

Staging:iio:tsl2583 Remove quoted string split across lines warnings

Signed-off-by: default avatarMichael Welling <mwelling@ieee.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 91342340
...@@ -165,8 +165,9 @@ taos_i2c_read(struct i2c_client *client, u8 reg, u8 *val, unsigned int len) ...@@ -165,8 +165,9 @@ taos_i2c_read(struct i2c_client *client, u8 reg, u8 *val, unsigned int len)
/* select register to write */ /* select register to write */
ret = i2c_smbus_write_byte(client, (TSL258X_CMD_REG | reg)); ret = i2c_smbus_write_byte(client, (TSL258X_CMD_REG | reg));
if (ret < 0) { if (ret < 0) {
dev_err(&client->dev, "taos_i2c_read failed to write" dev_err(&client->dev,
" register %x\n", reg); "taos_i2c_read failed to write register %x\n",
reg);
return ret; return ret;
} }
/* read the data */ /* read the data */
...@@ -231,8 +232,9 @@ static int taos_get_lux(struct iio_dev *indio_dev) ...@@ -231,8 +232,9 @@ static int taos_get_lux(struct iio_dev *indio_dev)
int reg = TSL258X_CMD_REG | (TSL258X_ALS_CHAN0LO + i); int reg = TSL258X_CMD_REG | (TSL258X_ALS_CHAN0LO + i);
ret = taos_i2c_read(chip->client, reg, &buf[i], 1); ret = taos_i2c_read(chip->client, reg, &buf[i], 1);
if (ret < 0) { if (ret < 0) {
dev_err(&chip->client->dev, "taos_get_lux failed to read" dev_err(&chip->client->dev,
" register %x\n", reg); "taos_get_lux failed to read register %x\n",
reg);
goto out_unlock; goto out_unlock;
} }
} }
...@@ -809,9 +811,7 @@ static int taos_probe(struct i2c_client *clientp, ...@@ -809,9 +811,7 @@ static int taos_probe(struct i2c_client *clientp,
if (!i2c_check_functionality(clientp->adapter, if (!i2c_check_functionality(clientp->adapter,
I2C_FUNC_SMBUS_BYTE_DATA)) { I2C_FUNC_SMBUS_BYTE_DATA)) {
dev_err(&clientp->dev, dev_err(&clientp->dev, "taos_probe() - i2c smbus byte data func unsupported\n");
"taos_probe() - i2c smbus byte data "
"functions unsupported\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
...@@ -830,30 +830,32 @@ static int taos_probe(struct i2c_client *clientp, ...@@ -830,30 +830,32 @@ static int taos_probe(struct i2c_client *clientp,
ret = i2c_smbus_write_byte(clientp, ret = i2c_smbus_write_byte(clientp,
(TSL258X_CMD_REG | (TSL258X_CNTRL + i))); (TSL258X_CMD_REG | (TSL258X_CNTRL + i)));
if (ret < 0) { if (ret < 0) {
dev_err(&clientp->dev, "i2c_smbus_write_bytes() to cmd " dev_err(&clientp->dev,
"reg failed in taos_probe(), err = %d\n", ret); "i2c_smbus_write_byte to cmd reg failed in taos_probe(), err = %d\n",
ret);
return ret; return ret;
} }
ret = i2c_smbus_read_byte(clientp); ret = i2c_smbus_read_byte(clientp);
if (ret < 0) { if (ret < 0) {
dev_err(&clientp->dev, "i2c_smbus_read_byte from " dev_err(&clientp->dev,
"reg failed in taos_probe(), err = %d\n", ret); "i2c_smbus_read_byte from reg failed in taos_probe(), err = %d\n",
ret);
return ret; return ret;
} }
buf[i] = ret; buf[i] = ret;
} }
if (!taos_tsl258x_device(buf)) { if (!taos_tsl258x_device(buf)) {
dev_info(&clientp->dev, "i2c device found but does not match " dev_info(&clientp->dev,
"expected id in taos_probe()\n"); "i2c device found but does not match expected id in taos_probe()\n");
return -EINVAL; return -EINVAL;
} }
ret = i2c_smbus_write_byte(clientp, (TSL258X_CMD_REG | TSL258X_CNTRL)); ret = i2c_smbus_write_byte(clientp, (TSL258X_CMD_REG | TSL258X_CNTRL));
if (ret < 0) { if (ret < 0) {
dev_err(&clientp->dev, "i2c_smbus_write_byte() to cmd reg " dev_err(&clientp->dev,
"failed in taos_probe(), err = %d\n", ret); "i2c_smbus_write_byte() to cmd reg failed in taos_probe(), err = %d\n",
ret);
return ret; return ret;
} }
......
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