iio: sx9310: Miscellaneous format fixes

Miscellaneous format fixes throughout the whole file.

Signed-off-by: Daniel Campello <campello@chromium.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c
index 1650da9b4f10cb3f8415baba7db118994940f699..51974477cd4de26d9214b3409c6d1b91f8106f3d 100644 (file)
--- a/drivers/iio/proximity/sx9310.c
+++ b/drivers/iio/proximity/sx9310.c
@@ -91,28 +91,21 @@
 #define   SX9310_REG_SAR_CTRL2_SAROFFSET_DEFAULT       0x3c
 
 #define SX9310_REG_SENSOR_SEL                          0x30
-
 #define SX9310_REG_USE_MSB                             0x31
 #define SX9310_REG_USE_LSB                             0x32
-
 #define SX9310_REG_AVG_MSB                             0x33
 #define SX9310_REG_AVG_LSB                             0x34
-
 #define SX9310_REG_DIFF_MSB                            0x35
 #define SX9310_REG_DIFF_LSB                            0x36
-
 #define SX9310_REG_OFFSET_MSB                          0x37
 #define SX9310_REG_OFFSET_LSB                          0x38
-
 #define SX9310_REG_SAR_MSB                             0x39
 #define SX9310_REG_SAR_LSB                             0x3a
-
 #define SX9310_REG_I2C_ADDR                            0x40
 #define SX9310_REG_PAUSE                               0x41
 #define SX9310_REG_WHOAMI                              0x42
 #define   SX9310_WHOAMI_VALUE                          0x01
 #define   SX9311_WHOAMI_VALUE                          0x02
-
 #define SX9310_REG_RESET                               0x7f
 #define   SX9310_SOFT_RESET                            0xde
 
@@ -408,7 +401,7 @@ static int sx9310_read_proximity(struct sx9310_data *data,
                goto out_disable_irq;
 
        *val = sign_extend32(be16_to_cpu(rawval),
-                            (chan->address == SX9310_REG_DIFF_MSB ? 11 : 15));
+                            chan->address == SX9310_REG_DIFF_MSB ? 11 : 15);
 
        ret = sx9310_disable_irq(data, SX9310_CONVDONE_IRQ);
        if (ret)
@@ -435,8 +428,9 @@ out:
 static int sx9310_read_samp_freq(struct sx9310_data *data, int *val, int *val2)
 {
        unsigned int regval;
-       int ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0, &regval);
+       int ret;
 
+       ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0, &regval);
        if (ret)
                return ret;
 
@@ -521,10 +515,9 @@ static irqreturn_t sx9310_irq_handler(int irq, void *private)
                iio_trigger_poll(data->trig);
 
        /*
-        * Even if no event is enabled, we need to wake the thread to
-        * clear the interrupt state by reading SX9310_REG_IRQ_SRC.  It
-        * is not possible to do that here because regmap_read takes a
-        * mutex.
+        * Even if no event is enabled, we need to wake the thread to clear the
+        * interrupt state by reading SX9310_REG_IRQ_SRC.
+        * It is not possible to do that here because regmap_read takes a mutex.
         */
        return IRQ_WAKE_THREAD;
 }
@@ -641,7 +634,7 @@ out_unlock:
 
 static struct attribute *sx9310_attributes[] = {
        &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
-       NULL,
+       NULL
 };
 
 static const struct attribute_group sx9310_attribute_group = {
@@ -969,7 +962,6 @@ static int __maybe_unused sx9310_suspend(struct device *dev)
        mutex_lock(&data->mutex);
        ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL0,
                          &data->suspend_ctrl0);
-
        if (ret)
                goto out;
 
@@ -1015,21 +1007,21 @@ static const struct dev_pm_ops sx9310_pm_ops = {
 static const struct acpi_device_id sx9310_acpi_match[] = {
        { "STH9310", SX9310_WHOAMI_VALUE },
        { "STH9311", SX9311_WHOAMI_VALUE },
-       {},
+       {}
 };
 MODULE_DEVICE_TABLE(acpi, sx9310_acpi_match);
 
 static const struct of_device_id sx9310_of_match[] = {
        { .compatible = "semtech,sx9310", (void *)SX9310_WHOAMI_VALUE },
        { .compatible = "semtech,sx9311", (void *)SX9311_WHOAMI_VALUE },
-       {},
+       {}
 };
 MODULE_DEVICE_TABLE(of, sx9310_of_match);
 
 static const struct i2c_device_id sx9310_id[] = {
        { "sx9310", SX9310_WHOAMI_VALUE },
        { "sx9311", SX9311_WHOAMI_VALUE },
-       {},
+       {}
 };
 MODULE_DEVICE_TABLE(i2c, sx9310_id);