iio: proximity: sx9500: make use of regmap_clear_bits(), regmap_set_bits()
authorTrevor Gamblin <tgamblin@baylibre.com>
Mon, 17 Jun 2024 13:50:18 +0000 (09:50 -0400)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Tue, 25 Jun 2024 20:04:48 +0000 (21:04 +0100)
Instead of using regmap_update_bits() and passing the mask twice, use
regmap_set_bits().

Instead of using regmap_update_bits() and passing val = 0, use
regmap_clear_bits().

Suggested-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20240617-review-v3-38-88d1338c4cca@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/proximity/sx9500.c

index b89d49defd7a341b22776c6f38d904e6150f786e..92630812ece23607a6a1f6b09ab0081151027ef2 100644 (file)
@@ -209,7 +209,7 @@ static int sx9500_inc_users(struct sx9500_data *data, int *counter,
                /* Bit is already active, nothing to do. */
                return 0;
 
-       return regmap_update_bits(data->regmap, reg, bitmask, bitmask);
+       return regmap_set_bits(data->regmap, reg, bitmask);
 }
 
 static int sx9500_dec_users(struct sx9500_data *data, int *counter,
@@ -220,7 +220,7 @@ static int sx9500_dec_users(struct sx9500_data *data, int *counter,
                /* There are more users, do not deactivate. */
                return 0;
 
-       return regmap_update_bits(data->regmap, reg, bitmask, 0);
+       return regmap_clear_bits(data->regmap, reg, bitmask);
 }
 
 static int sx9500_inc_chan_users(struct sx9500_data *data, int chan)
@@ -795,8 +795,8 @@ static int sx9500_init_compensation(struct iio_dev *indio_dev)
        int i, ret;
        unsigned int val;
 
-       ret = regmap_update_bits(data->regmap, SX9500_REG_PROX_CTRL0,
-                                SX9500_CHAN_MASK, SX9500_CHAN_MASK);
+       ret = regmap_set_bits(data->regmap, SX9500_REG_PROX_CTRL0,
+                             SX9500_CHAN_MASK);
        if (ret < 0)
                return ret;
 
@@ -815,8 +815,8 @@ static int sx9500_init_compensation(struct iio_dev *indio_dev)
        }
 
 out:
-       regmap_update_bits(data->regmap, SX9500_REG_PROX_CTRL0,
-                          SX9500_CHAN_MASK, 0);
+       regmap_clear_bits(data->regmap, SX9500_REG_PROX_CTRL0,
+                         SX9500_CHAN_MASK);
        return ret;
 }