Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[mirror_ubuntu-artful-kernel.git] / drivers / staging / iio / accel / sca3000_core.c

diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index dbe0a649e4f25f5f69cfd1c66211b95babf51898..02e930c55570237817e24c629b3f7df11fbd1fdd 100644 (file)
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -849,9 +849,9 @@ static int sca3000_read_event_config(struct iio_dev *indio_dev,
        if (ret)
                goto error_ret;
 
-       if ((st->rx[0] & protect_mask) != SCA3000_MEAS_MODE_MOT_DET)
+       if ((st->rx[0] & protect_mask) != SCA3000_MEAS_MODE_MOT_DET) {
                ret = 0;
-       else {
+       } else {
                ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_MD_CTRL);
                if (ret < 0)
                        goto error_ret;
@@ -980,14 +980,14 @@ static int sca3000_write_event_config(struct iio_dev *indio_dev,
        if (ret)
                goto exit_point;
        /* if off and should be on */
-       if ((st->mo_det_use_count)
-           && ((st->rx[0] & protect_mask) != SCA3000_MEAS_MODE_MOT_DET))
+       if ((st->mo_det_use_count) &&
+           ((st->rx[0] & protect_mask) != SCA3000_MEAS_MODE_MOT_DET))
                ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE,
                                        (st->rx[0] & ~protect_mask)
                                        | SCA3000_MEAS_MODE_MOT_DET);
        /* if on and should be off */
-       else if (!(st->mo_det_use_count)
-                && ((st->rx[0] & protect_mask) == SCA3000_MEAS_MODE_MOT_DET))
+       else if (!(st->mo_det_use_count) &&
+                ((st->rx[0] & protect_mask) == SCA3000_MEAS_MODE_MOT_DET))
                ret = sca3000_write_reg(st, SCA3000_REG_ADDR_MODE,
                                        (st->rx[0] & ~protect_mask));
 exit_point:
@@ -1197,7 +1197,6 @@ MODULE_DEVICE_TABLE(spi, sca3000_id);
 static struct spi_driver sca3000_driver = {
        .driver = {
                .name = "sca3000",
-               .owner = THIS_MODULE,
        },
        .probe = sca3000_probe,
        .remove = sca3000_remove,