| Message ID | 20200313104955.30423-5-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/8] iio: light: st_uvis25: Drop unneeded casting when print error code | expand |
On Fri, 13 Mar 2020 12:49:52 +0200 Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > For easy grepping on debug purposes join string literals back in > the messages. > > No functional change. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied. Thanks, Jonathan > --- > v2: no change > drivers/iio/common/st_sensors/st_sensors_core.c | 3 +-- > drivers/iio/common/st_sensors/st_sensors_trigger.c | 13 ++++--------- > 2 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c > index 804a9068e687..2e42838ca4f4 100644 > --- a/drivers/iio/common/st_sensors/st_sensors_core.c > +++ b/drivers/iio/common/st_sensors/st_sensors_core.c > @@ -277,8 +277,7 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev, > !sdata->sensor_settings->drdy_irq.int2.addr) { > if (pdata->drdy_int_pin) > dev_info(&indio_dev->dev, > - "DRDY on pin INT%d specified, but sensor " > - "does not support interrupts\n", > + "DRDY on pin INT%d specified, but sensor does not support interrupts\n", > pdata->drdy_int_pin); > return 0; > } > diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c > index e817537cdfb5..0507283bd4c1 100644 > --- a/drivers/iio/common/st_sensors/st_sensors_trigger.c > +++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c > @@ -44,8 +44,7 @@ static int st_sensors_new_samples_available(struct iio_dev *indio_dev, > sdata->sensor_settings->drdy_irq.stat_drdy.addr, > &status); > if (ret < 0) { > - dev_err(sdata->dev, > - "error checking samples available\n"); > + dev_err(sdata->dev, "error checking samples available\n"); > return ret; > } > > @@ -148,9 +147,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, > case IRQF_TRIGGER_LOW: > if (!sdata->sensor_settings->drdy_irq.addr_ihl) { > dev_err(&indio_dev->dev, > - "falling/low specified for IRQ " > - "but hardware supports only rising/high: " > - "will request rising/high\n"); > + "falling/low specified for IRQ but hardware supports only rising/high: will request rising/high\n"); > if (irq_trig == IRQF_TRIGGER_FALLING) > irq_trig = IRQF_TRIGGER_RISING; > if (irq_trig == IRQF_TRIGGER_LOW) > @@ -163,8 +160,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, > if (err < 0) > goto iio_trigger_free; > dev_info(&indio_dev->dev, > - "interrupts on the falling edge or " > - "active low level\n"); > + "interrupts on the falling edge or active low level\n"); > } > break; > case IRQF_TRIGGER_RISING: > @@ -178,8 +174,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, > default: > /* This is the most preferred mode, if possible */ > dev_err(&indio_dev->dev, > - "unsupported IRQ trigger specified (%lx), enforce " > - "rising edge\n", irq_trig); > + "unsupported IRQ trigger specified (%lx), enforce rising edge\n", irq_trig); > irq_trig = IRQF_TRIGGER_RISING; > } >
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c index 804a9068e687..2e42838ca4f4 100644 --- a/drivers/iio/common/st_sensors/st_sensors_core.c +++ b/drivers/iio/common/st_sensors/st_sensors_core.c @@ -277,8 +277,7 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev, !sdata->sensor_settings->drdy_irq.int2.addr) { if (pdata->drdy_int_pin) dev_info(&indio_dev->dev, - "DRDY on pin INT%d specified, but sensor " - "does not support interrupts\n", + "DRDY on pin INT%d specified, but sensor does not support interrupts\n", pdata->drdy_int_pin); return 0; } diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c index e817537cdfb5..0507283bd4c1 100644 --- a/drivers/iio/common/st_sensors/st_sensors_trigger.c +++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c @@ -44,8 +44,7 @@ static int st_sensors_new_samples_available(struct iio_dev *indio_dev, sdata->sensor_settings->drdy_irq.stat_drdy.addr, &status); if (ret < 0) { - dev_err(sdata->dev, - "error checking samples available\n"); + dev_err(sdata->dev, "error checking samples available\n"); return ret; } @@ -148,9 +147,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, case IRQF_TRIGGER_LOW: if (!sdata->sensor_settings->drdy_irq.addr_ihl) { dev_err(&indio_dev->dev, - "falling/low specified for IRQ " - "but hardware supports only rising/high: " - "will request rising/high\n"); + "falling/low specified for IRQ but hardware supports only rising/high: will request rising/high\n"); if (irq_trig == IRQF_TRIGGER_FALLING) irq_trig = IRQF_TRIGGER_RISING; if (irq_trig == IRQF_TRIGGER_LOW) @@ -163,8 +160,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, if (err < 0) goto iio_trigger_free; dev_info(&indio_dev->dev, - "interrupts on the falling edge or " - "active low level\n"); + "interrupts on the falling edge or active low level\n"); } break; case IRQF_TRIGGER_RISING: @@ -178,8 +174,7 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, default: /* This is the most preferred mode, if possible */ dev_err(&indio_dev->dev, - "unsupported IRQ trigger specified (%lx), enforce " - "rising edge\n", irq_trig); + "unsupported IRQ trigger specified (%lx), enforce rising edge\n", irq_trig); irq_trig = IRQF_TRIGGER_RISING; }
For easy grepping on debug purposes join string literals back in the messages. No functional change. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- v2: no change drivers/iio/common/st_sensors/st_sensors_core.c | 3 +-- drivers/iio/common/st_sensors/st_sensors_trigger.c | 13 ++++--------- 2 files changed, 5 insertions(+), 11 deletions(-)