TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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://lore.kernel.org/r/20240617-review-v3-8-88d1338c4cca@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Trevor Gamblin
2024-06-17 09:49:48 -04:00
committed by Jonathan Cameron
parent e3007f6d59
commit 5dcd6eb3ef
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/iio/adc/berlin2-adc.c
+11 -13
View File
@@ -129,8 +129,8 @@ static int berlin2_adc_read(struct iio_dev *indio_dev, int channel)
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
/* Disable the interrupts */ /* Disable the interrupts */
regmap_update_bits(priv->regmap, BERLIN2_SM_ADC_STATUS, regmap_clear_bits(priv->regmap, BERLIN2_SM_ADC_STATUS,
BERLIN2_SM_ADC_STATUS_INT_EN(channel), 0); BERLIN2_SM_ADC_STATUS_INT_EN(channel));
if (ret == 0) if (ret == 0)
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
@@ -139,8 +139,8 @@ static int berlin2_adc_read(struct iio_dev *indio_dev, int channel)
return ret; return ret;
} }
regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL, regmap_clear_bits(priv->regmap, BERLIN2_SM_CTRL,
BERLIN2_SM_CTRL_ADC_START, 0); BERLIN2_SM_CTRL_ADC_START);
data = priv->data; data = priv->data;
priv->data_available = false; priv->data_available = false;
@@ -180,8 +180,8 @@ static int berlin2_adc_tsen_read(struct iio_dev *indio_dev)
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
/* Disable interrupts */ /* Disable interrupts */
regmap_update_bits(priv->regmap, BERLIN2_SM_TSEN_STATUS, regmap_clear_bits(priv->regmap, BERLIN2_SM_TSEN_STATUS,
BERLIN2_SM_TSEN_STATUS_INT_EN, 0); BERLIN2_SM_TSEN_STATUS_INT_EN);
if (ret == 0) if (ret == 0)
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
@@ -190,8 +190,8 @@ static int berlin2_adc_tsen_read(struct iio_dev *indio_dev)
return ret; return ret;
} }
regmap_update_bits(priv->regmap, BERLIN2_SM_TSEN_CTRL, regmap_clear_bits(priv->regmap, BERLIN2_SM_TSEN_CTRL,
BERLIN2_SM_TSEN_CTRL_START, 0); BERLIN2_SM_TSEN_CTRL_START);
data = priv->data; data = priv->data;
priv->data_available = false; priv->data_available = false;
@@ -284,8 +284,7 @@ static const struct iio_info berlin2_adc_info = {
static void berlin2_adc_powerdown(void *regmap) static void berlin2_adc_powerdown(void *regmap)
{ {
regmap_update_bits(regmap, BERLIN2_SM_CTRL, regmap_clear_bits(regmap, BERLIN2_SM_CTRL, BERLIN2_SM_CTRL_ADC_POWER);
BERLIN2_SM_CTRL_ADC_POWER, 0);
} }
@@ -339,9 +338,8 @@ static int berlin2_adc_probe(struct platform_device *pdev)
indio_dev->num_channels = ARRAY_SIZE(berlin2_adc_channels); indio_dev->num_channels = ARRAY_SIZE(berlin2_adc_channels);
/* Power up the ADC */ /* Power up the ADC */
regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL, regmap_set_bits(priv->regmap, BERLIN2_SM_CTRL,
BERLIN2_SM_CTRL_ADC_POWER, BERLIN2_SM_CTRL_ADC_POWER);
BERLIN2_SM_CTRL_ADC_POWER);
ret = devm_add_action_or_reset(&pdev->dev, berlin2_adc_powerdown, ret = devm_add_action_or_reset(&pdev->dev, berlin2_adc_powerdown,
priv->regmap); priv->regmap);