iio: adc: cpcap-adc: make use of regmap_clear_bits(), regmap_set_bits()

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-9-88d1338c4cca@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c
index b6c4ef70484ea01097824948bd098497132e9488..c218acf6c9c6067afdea20468508d06f4a0e9d01 100644 (file)
--- a/drivers/iio/adc/cpcap-adc.c
+++ b/drivers/iio/adc/cpcap-adc.c
@@ -385,9 +385,8 @@ static irqreturn_t cpcap_adc_irq_thread(int irq, void *data)
        struct cpcap_adc *ddata = iio_priv(indio_dev);
        int error;
 
-       error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                  CPCAP_BIT_ADTRIG_DIS,
-                                  CPCAP_BIT_ADTRIG_DIS);
+       error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
+                               CPCAP_BIT_ADTRIG_DIS);
        if (error)
                return IRQ_NONE;
 
@@ -424,23 +423,19 @@ static void cpcap_adc_setup_calibrate(struct cpcap_adc *ddata,
        if (error)
                return;
 
-       error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                  CPCAP_BIT_ATOX_PS_FACTOR |
-                                  CPCAP_BIT_ADC_PS_FACTOR1 |
-                                  CPCAP_BIT_ADC_PS_FACTOR0,
-                                  0);
+       error = regmap_clear_bits(ddata->reg, CPCAP_REG_ADCC2,
+                                 CPCAP_BIT_ATOX_PS_FACTOR |
+                                 CPCAP_BIT_ADC_PS_FACTOR1 |
+                                 CPCAP_BIT_ADC_PS_FACTOR0);
        if (error)
                return;
 
-       error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                  CPCAP_BIT_ADTRIG_DIS,
-                                  CPCAP_BIT_ADTRIG_DIS);
+       error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
+                               CPCAP_BIT_ADTRIG_DIS);
        if (error)
                return;
 
-       error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                  CPCAP_BIT_ASC,
-                                  CPCAP_BIT_ASC);
+       error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2, CPCAP_BIT_ASC);
        if (error)
                return;
 
@@ -455,8 +450,8 @@ static void cpcap_adc_setup_calibrate(struct cpcap_adc *ddata,
                dev_err(ddata->dev,
                        "Timeout waiting for calibration to complete\n");
 
-       error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC1,
-                                  CPCAP_BIT_CAL_MODE, 0);
+       error = regmap_clear_bits(ddata->reg, CPCAP_REG_ADCC1,
+                                 CPCAP_BIT_CAL_MODE);
        if (error)
                return;
 }
@@ -602,26 +597,23 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata,
                return;
 
        if (req->timing == CPCAP_ADC_TIMING_IMM) {
-               error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                          CPCAP_BIT_ADTRIG_DIS,
-                                          CPCAP_BIT_ADTRIG_DIS);
+               error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
+                                       CPCAP_BIT_ADTRIG_DIS);
                if (error)
                        return;
 
-               error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                          CPCAP_BIT_ASC,
-                                          CPCAP_BIT_ASC);
+               error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
+                                       CPCAP_BIT_ASC);
                if (error)
                        return;
        } else {
-               error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                          CPCAP_BIT_ADTRIG_ONESHOT,
-                                          CPCAP_BIT_ADTRIG_ONESHOT);
+               error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
+                                       CPCAP_BIT_ADTRIG_ONESHOT);
                if (error)
                        return;
 
-               error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-                                          CPCAP_BIT_ADTRIG_DIS, 0);
+               error = regmap_clear_bits(ddata->reg, CPCAP_REG_ADCC2,
+                                         CPCAP_BIT_ADTRIG_DIS);
                if (error)
                        return;
        }