Commit c46a955a authored by Trevor Gamblin's avatar Trevor Gamblin Committed by Jonathan Cameron

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: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Signed-off-by: default avatarTrevor Gamblin <tgamblin@baylibre.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@baylibre.com>
Link: https://patch.msgid.link/20240617-review-v3-9-88d1338c4cca@baylibre.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent a0e3573e
...@@ -385,8 +385,7 @@ static irqreturn_t cpcap_adc_irq_thread(int irq, void *data) ...@@ -385,8 +385,7 @@ static irqreturn_t cpcap_adc_irq_thread(int irq, void *data)
struct cpcap_adc *ddata = iio_priv(indio_dev); struct cpcap_adc *ddata = iio_priv(indio_dev);
int error; int error;
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
CPCAP_BIT_ADTRIG_DIS,
CPCAP_BIT_ADTRIG_DIS); CPCAP_BIT_ADTRIG_DIS);
if (error) if (error)
return IRQ_NONE; return IRQ_NONE;
...@@ -424,23 +423,19 @@ static void cpcap_adc_setup_calibrate(struct cpcap_adc *ddata, ...@@ -424,23 +423,19 @@ static void cpcap_adc_setup_calibrate(struct cpcap_adc *ddata,
if (error) if (error)
return; return;
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_clear_bits(ddata->reg, CPCAP_REG_ADCC2,
CPCAP_BIT_ATOX_PS_FACTOR | CPCAP_BIT_ATOX_PS_FACTOR |
CPCAP_BIT_ADC_PS_FACTOR1 | CPCAP_BIT_ADC_PS_FACTOR1 |
CPCAP_BIT_ADC_PS_FACTOR0, CPCAP_BIT_ADC_PS_FACTOR0);
0);
if (error) if (error)
return; return;
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
CPCAP_BIT_ADTRIG_DIS,
CPCAP_BIT_ADTRIG_DIS); CPCAP_BIT_ADTRIG_DIS);
if (error) if (error)
return; return;
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2, CPCAP_BIT_ASC);
CPCAP_BIT_ASC,
CPCAP_BIT_ASC);
if (error) if (error)
return; return;
...@@ -455,8 +450,8 @@ static void cpcap_adc_setup_calibrate(struct cpcap_adc *ddata, ...@@ -455,8 +450,8 @@ static void cpcap_adc_setup_calibrate(struct cpcap_adc *ddata,
dev_err(ddata->dev, dev_err(ddata->dev,
"Timeout waiting for calibration to complete\n"); "Timeout waiting for calibration to complete\n");
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC1, error = regmap_clear_bits(ddata->reg, CPCAP_REG_ADCC1,
CPCAP_BIT_CAL_MODE, 0); CPCAP_BIT_CAL_MODE);
if (error) if (error)
return; return;
} }
...@@ -602,26 +597,23 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata, ...@@ -602,26 +597,23 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata,
return; return;
if (req->timing == CPCAP_ADC_TIMING_IMM) { if (req->timing == CPCAP_ADC_TIMING_IMM) {
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
CPCAP_BIT_ADTRIG_DIS,
CPCAP_BIT_ADTRIG_DIS); CPCAP_BIT_ADTRIG_DIS);
if (error) if (error)
return; return;
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
CPCAP_BIT_ASC,
CPCAP_BIT_ASC); CPCAP_BIT_ASC);
if (error) if (error)
return; return;
} else { } else {
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_set_bits(ddata->reg, CPCAP_REG_ADCC2,
CPCAP_BIT_ADTRIG_ONESHOT,
CPCAP_BIT_ADTRIG_ONESHOT); CPCAP_BIT_ADTRIG_ONESHOT);
if (error) if (error)
return; return;
error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2, error = regmap_clear_bits(ddata->reg, CPCAP_REG_ADCC2,
CPCAP_BIT_ADTRIG_DIS, 0); CPCAP_BIT_ADTRIG_DIS);
if (error) if (error)
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment