hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio:adc:berlin2-adc: coding style cleanup 

Some adjustment of indentation to make checkpatch.pl happy in strict mode.

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Acked-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Hartmut Knaack 2015-07-28 00:39:04 +02:00 committed by Jonathan Cameron
parent 3ac065224f
commit b465fc5499
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/iio/adc/berlin2-adc.c
View File

@ -117,9 +117,11 @@ static int berlin2_adc_read(struct iio_dev *indio_dev, int channel)
/* Configure the ADC */ /* Configure the ADC */
regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL, regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL,
BERLIN2_SM_CTRL_ADC_RESET | BERLIN2_SM_CTRL_ADC_SEL_MASK BERLIN2_SM_CTRL_ADC_RESET |
| BERLIN2_SM_CTRL_ADC_START, BERLIN2_SM_CTRL_ADC_SEL_MASK |
BERLIN2_SM_CTRL_ADC_SEL(channel) | BERLIN2_SM_CTRL_ADC_START); BERLIN2_SM_CTRL_ADC_START,
BERLIN2_SM_CTRL_ADC_SEL(channel) |
BERLIN2_SM_CTRL_ADC_START);
ret = wait_event_interruptible_timeout(priv->wq, priv->data_available, ret = wait_event_interruptible_timeout(priv->wq, priv->data_available,
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
@ -159,15 +161,18 @@ static int berlin2_adc_tsen_read(struct iio_dev *indio_dev)
/* Configure the ADC */ /* Configure the ADC */
regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL, regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL,
BERLIN2_SM_CTRL_TSEN_RESET | BERLIN2_SM_CTRL_ADC_ROTATE, BERLIN2_SM_CTRL_TSEN_RESET |
BERLIN2_SM_CTRL_ADC_ROTATE,
BERLIN2_SM_CTRL_ADC_ROTATE); BERLIN2_SM_CTRL_ADC_ROTATE);
/* Configure the temperature sensor */ /* Configure the temperature sensor */
regmap_update_bits(priv->regmap, BERLIN2_SM_TSEN_CTRL, regmap_update_bits(priv->regmap, BERLIN2_SM_TSEN_CTRL,
BERLIN2_SM_TSEN_CTRL_TRIM_MASK | BERLIN2_SM_TSEN_CTRL_SETTLING_MASK BERLIN2_SM_TSEN_CTRL_TRIM_MASK |
| BERLIN2_SM_TSEN_CTRL_START, BERLIN2_SM_TSEN_CTRL_SETTLING_MASK |
BERLIN2_SM_TSEN_CTRL_TRIM(3) | BERLIN2_SM_TSEN_CTRL_SETTLING_12 BERLIN2_SM_TSEN_CTRL_START,
| BERLIN2_SM_TSEN_CTRL_START); BERLIN2_SM_TSEN_CTRL_TRIM(3) |
BERLIN2_SM_TSEN_CTRL_SETTLING_12 |
BERLIN2_SM_TSEN_CTRL_START);
ret = wait_event_interruptible_timeout(priv->wq, priv->data_available, ret = wait_event_interruptible_timeout(priv->wq, priv->data_available,
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
@ -195,8 +200,8 @@ static int berlin2_adc_tsen_read(struct iio_dev *indio_dev)
} }
static int berlin2_adc_read_raw(struct iio_dev *indio_dev, static int berlin2_adc_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, int *val, int *val2, struct iio_chan_spec const *chan, int *val,
long mask) int *val2, long mask)
{ {
int temp; int temp;
@ -327,7 +332,8 @@ static int berlin2_adc_probe(struct platform_device *pdev)
/* Power up the ADC */ /* Power up the ADC */
regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL, regmap_update_bits(priv->regmap, BERLIN2_SM_CTRL,
BERLIN2_SM_CTRL_ADC_POWER, BERLIN2_SM_CTRL_ADC_POWER); BERLIN2_SM_CTRL_ADC_POWER,
BERLIN2_SM_CTRL_ADC_POWER);
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) { if (ret) {