Merge remote-tracking branch 'staging/staging-next'

[karo-tx-linux.git] / drivers / staging / iio / meter / ade7753.c

diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index ffc7f0ddff14c7cc24eee0c109b6f6beefa1a928..f129039bece3c74b96fb78e70996ea65279502ea 100644 (file)
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -219,7 +219,7 @@ static int ade7753_reset(struct device *dev)
        u16 val;
 
        ade7753_spi_read_reg_16(dev, ADE7753_MODE, &val);
-       val |= 1 << 6; /* Software Chip Reset */
+       val |= BIT(6); /* Software Chip Reset */
 
        return ade7753_spi_write_reg_16(dev, ADE7753_MODE, val);
 }
@@ -328,10 +328,10 @@ static int ade7753_set_irq(struct device *dev, bool enable)
                goto error_ret;
 
        if (enable)
-               irqen |= 1 << 3; /* Enables an interrupt when a data is
+               irqen |= BIT(3); /* Enables an interrupt when a data is
                                    present in the waveform register */
        else
-               irqen &= ~(1 << 3);
+               irqen &= ~BIT(3);
 
        ret = ade7753_spi_write_reg_8(dev, ADE7753_IRQEN, irqen);
 
@@ -345,7 +345,7 @@ static int ade7753_stop_device(struct device *dev)
        u16 val;
 
        ade7753_spi_read_reg_16(dev, ADE7753_MODE, &val);
-       val |= 1 << 4;  /* AD converters can be turned off */
+       val |= BIT(4);  /* AD converters can be turned off */
 
        return ade7753_spi_write_reg_16(dev, ADE7753_MODE, val);
 }
@@ -406,7 +406,7 @@ static ssize_t ade7753_write_frequency(struct device *dev,
        ret = kstrtou16(buf, 10, &val);
        if (ret)
                return ret;
-       if (val == 0)
+       if (!val)
                return -EINVAL;
 
        mutex_lock(&indio_dev->mlock);
@@ -534,7 +534,6 @@ static int ade7753_remove(struct spi_device *spi)
 static struct spi_driver ade7753_driver = {
        .driver = {
                .name = "ade7753",
-               .owner = THIS_MODULE,
        },
        .probe = ade7753_probe,
        .remove = ade7753_remove,