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

iio: adc: stm32-dfsdm-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-18-88d1338c4cca@baylibre.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 059fbfaa
...@@ -759,8 +759,7 @@ static int stm32_dfsdm_start_conv(struct iio_dev *indio_dev, ...@@ -759,8 +759,7 @@ static int stm32_dfsdm_start_conv(struct iio_dev *indio_dev,
return 0; return 0;
filter_unconfigure: filter_unconfigure:
regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id), regmap_clear_bits(regmap, DFSDM_CR1(adc->fl_id), DFSDM_CR1_CFG_MASK);
DFSDM_CR1_CFG_MASK, 0);
stop_channels: stop_channels:
stm32_dfsdm_stop_channel(indio_dev); stm32_dfsdm_stop_channel(indio_dev);
...@@ -774,8 +773,7 @@ static void stm32_dfsdm_stop_conv(struct iio_dev *indio_dev) ...@@ -774,8 +773,7 @@ static void stm32_dfsdm_stop_conv(struct iio_dev *indio_dev)
stm32_dfsdm_stop_filter(adc->dfsdm, adc->fl_id); stm32_dfsdm_stop_filter(adc->dfsdm, adc->fl_id);
regmap_update_bits(regmap, DFSDM_CR1(adc->fl_id), regmap_clear_bits(regmap, DFSDM_CR1(adc->fl_id), DFSDM_CR1_CFG_MASK);
DFSDM_CR1_CFG_MASK, 0);
stm32_dfsdm_stop_channel(indio_dev); stm32_dfsdm_stop_channel(indio_dev);
} }
...@@ -951,15 +949,13 @@ static int stm32_dfsdm_adc_dma_start(struct iio_dev *indio_dev) ...@@ -951,15 +949,13 @@ static int stm32_dfsdm_adc_dma_start(struct iio_dev *indio_dev)
if (adc->nconv == 1 && !indio_dev->trig) { if (adc->nconv == 1 && !indio_dev->trig) {
/* Enable regular DMA transfer*/ /* Enable regular DMA transfer*/
ret = regmap_update_bits(adc->dfsdm->regmap, ret = regmap_set_bits(adc->dfsdm->regmap,
DFSDM_CR1(adc->fl_id), DFSDM_CR1(adc->fl_id),
DFSDM_CR1_RDMAEN_MASK,
DFSDM_CR1_RDMAEN_MASK); DFSDM_CR1_RDMAEN_MASK);
} else { } else {
/* Enable injected DMA transfer*/ /* Enable injected DMA transfer*/
ret = regmap_update_bits(adc->dfsdm->regmap, ret = regmap_set_bits(adc->dfsdm->regmap,
DFSDM_CR1(adc->fl_id), DFSDM_CR1(adc->fl_id),
DFSDM_CR1_JDMAEN_MASK,
DFSDM_CR1_JDMAEN_MASK); DFSDM_CR1_JDMAEN_MASK);
} }
...@@ -981,8 +977,8 @@ static void stm32_dfsdm_adc_dma_stop(struct iio_dev *indio_dev) ...@@ -981,8 +977,8 @@ static void stm32_dfsdm_adc_dma_stop(struct iio_dev *indio_dev)
if (!adc->dma_chan) if (!adc->dma_chan)
return; return;
regmap_update_bits(adc->dfsdm->regmap, DFSDM_CR1(adc->fl_id), regmap_clear_bits(adc->dfsdm->regmap, DFSDM_CR1(adc->fl_id),
DFSDM_CR1_RDMAEN_MASK | DFSDM_CR1_JDMAEN_MASK, 0); DFSDM_CR1_RDMAEN_MASK | DFSDM_CR1_JDMAEN_MASK);
dmaengine_terminate_all(adc->dma_chan); dmaengine_terminate_all(adc->dma_chan);
} }
...@@ -1305,8 +1301,7 @@ static irqreturn_t stm32_dfsdm_irq(int irq, void *arg) ...@@ -1305,8 +1301,7 @@ static irqreturn_t stm32_dfsdm_irq(int irq, void *arg)
if (status & DFSDM_ISR_ROVRF_MASK) { if (status & DFSDM_ISR_ROVRF_MASK) {
if (int_en & DFSDM_CR2_ROVRIE_MASK) if (int_en & DFSDM_CR2_ROVRIE_MASK)
dev_warn(&indio_dev->dev, "Overrun detected\n"); dev_warn(&indio_dev->dev, "Overrun detected\n");
regmap_update_bits(regmap, DFSDM_ICR(adc->fl_id), regmap_set_bits(regmap, DFSDM_ICR(adc->fl_id),
DFSDM_ICR_CLRROVRF_MASK,
DFSDM_ICR_CLRROVRF_MASK); DFSDM_ICR_CLRROVRF_MASK);
} }
......
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