]> git.baikalelectronics.ru Git - kernel.git/commitdiff
iio: st_sensors: Join string literals back
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 13 Mar 2020 10:49:52 +0000 (12:49 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 21 Mar 2020 10:26:43 +0000 (10:26 +0000)
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>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/common/st_sensors/st_sensors_core.c
drivers/iio/common/st_sensors/st_sensors_trigger.c

index c6f0bcb6d10f79e48a2cdf3c02185908063f6765..a0c2cbd60c6f4115ff299211d81463fad02c896f 100644 (file)
@@ -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;
        }
index e817537cdfb5dd536881c816436c719168b07ac1..0507283bd4c1dedd78780f9c20dcca39beef0748 100644 (file)
@@ -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;
        }