Re: [PATCH 2/3] Staging: iio: Remove quoted string split across lines warnings

Jonathan Cameron
2014-04-12T17:30:17Z

On 10/04/14 03:26, Michael Welling wrote:
> Signed-off-by: Michael Welling <mwelling@ieee.org>
Applied to the togreg branch of iio.git - initially pushed out as testing.

Thanks,
> ---
> drivers/staging/iio/light/tsl2583.c | 34 ++++++++++++++++++----------------
> 1 file changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
> index 77c7f65..f015fb4 100644
> --- a/drivers/staging/iio/light/tsl2583.c
> +++ b/drivers/staging/iio/light/tsl2583.c
> @@ -165,8 +165,9 @@ taos_i2c_read(struct i2c_client *client, u8 reg, u8 *val, unsigned int len)
> /* select register to write */
> ret = i2c_smbus_write_byte(client, (TSL258X_CMD_REG | reg));
> if (ret < 0) {
> - dev_err(&client->dev, "taos_i2c_read failed to write"
> - " register %x\n", reg);
> + dev_err(&client->dev,
> + "taos_i2c_read failed to write register %x\n",
> + reg);
> return ret;
> }
> /* read the data */
> @@ -231,8 +232,9 @@ static int taos_get_lux(struct iio_dev *indio_dev)
> int reg = TSL258X_CMD_REG | (TSL258X_ALS_CHAN0LO + i);
> ret = taos_i2c_read(chip->client, reg, &buf[i], 1);
> if (ret < 0) {
> - dev_err(&chip->client->dev, "taos_get_lux failed to read"
> - " register %x\n", reg);
> + dev_err(&chip->client->dev,
> + "taos_get_lux failed to read register %x\n",
> + reg);
> goto out_unlock;
> }
> }
> @@ -809,9 +811,7 @@ static int taos_probe(struct i2c_client *clientp,
>
> if (!i2c_check_functionality(clientp->adapter,
> I2C_FUNC_SMBUS_BYTE_DATA)) {
> - dev_err(&clientp->dev,
> - "taos_probe() - i2c smbus byte data "
> - "functions unsupported\n");
> + dev_err(&clientp->dev, "taos_probe() - i2c smbus byte data func unsupported\n");
> return -EOPNOTSUPP;
> }
>
> @@ -830,30 +830,32 @@ static int taos_probe(struct i2c_client *clientp,
> ret = i2c_smbus_write_byte(clientp,
> (TSL258X_CMD_REG | (TSL258X_CNTRL + i)));
> if (ret < 0) {
> - dev_err(&clientp->dev, "i2c_smbus_write_bytes() to cmd "
> - "reg failed in taos_probe(), err = %d\n", ret);
> + dev_err(&clientp->dev,
> + "i2c_smbus_write_byte to cmd reg failed in taos_probe(), err = %d\n",
> + ret);
> return ret;
> }
> ret = i2c_smbus_read_byte(clientp);
> if (ret < 0) {
> - dev_err(&clientp->dev, "i2c_smbus_read_byte from "
> - "reg failed in taos_probe(), err = %d\n", ret);
> -
> + dev_err(&clientp->dev,
> + "i2c_smbus_read_byte from reg failed in taos_probe(), err = %d\n",
> + ret);
> return ret;
> }
> buf[i] = ret;
> }
>
> if (!taos_tsl258x_device(buf)) {
> - dev_info(&clientp->dev, "i2c device found but does not match "
> - "expected id in taos_probe()\n");
> + dev_info(&clientp->dev,
> + "i2c device found but does not match expected id in taos_probe()\n");
> return -EINVAL;
> }
>
> ret = i2c_smbus_write_byte(clientp, (TSL258X_CMD_REG | TSL258X_CNTRL));
> if (ret < 0) {
> - dev_err(&clientp->dev, "i2c_smbus_write_byte() to cmd reg "
> - "failed in taos_probe(), err = %d\n", ret);
> + dev_err(&clientp->dev,
> + "i2c_smbus_write_byte() to cmd reg failed in taos_probe(), err = %d\n",
> + ret);
> return ret;
> }
>
>