Commit e8ef49f0 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Greg Kroah-Hartman

staging: iio: adc: properly indent to match open paranthesis

Indent parameters and arguments passed to function calls to match
open paranthesis
Signed-off-by: default avatarIoana Ciornei <ciorneiioana@gmail.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e4f0075
...@@ -359,7 +359,8 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO, ...@@ -359,7 +359,8 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
ad7192_read_frequency, ad7192_read_frequency,
ad7192_write_frequency); ad7192_write_frequency);
static ssize_t ad7192_show_scale_available(struct device *dev, static ssize_t
ad7192_show_scale_available(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
......
...@@ -492,8 +492,8 @@ static int ad7280_channel_init(struct ad7280_state *st) ...@@ -492,8 +492,8 @@ static int ad7280_channel_init(struct ad7280_state *st)
return -ENOMEM; return -ENOMEM;
for (dev = 0, cnt = 0; dev <= st->slave_num; dev++) for (dev = 0, cnt = 0; dev <= st->slave_num; dev++)
for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_AUX_ADC_6; ch++, for (ch = AD7280A_CELL_VOLTAGE_1; ch <= AD7280A_AUX_ADC_6;
cnt++) { ch++, cnt++) {
if (ch < AD7280A_AUX_ADC_1) { if (ch < AD7280A_AUX_ADC_1) {
st->channels[cnt].type = IIO_VOLTAGE; st->channels[cnt].type = IIO_VOLTAGE;
st->channels[cnt].differential = 1; st->channels[cnt].differential = 1;
...@@ -567,8 +567,8 @@ static int ad7280_attr_init(struct ad7280_state *st) ...@@ -567,8 +567,8 @@ static int ad7280_attr_init(struct ad7280_state *st)
st->iio_attr[cnt].dev_attr.attr.name = st->iio_attr[cnt].dev_attr.attr.name =
kasprintf(GFP_KERNEL, kasprintf(GFP_KERNEL,
"in%d-in%d_balance_switch_en", "in%d-in%d_balance_switch_en",
(dev * AD7280A_CELLS_PER_DEV) + ch, dev * AD7280A_CELLS_PER_DEV + ch,
(dev * AD7280A_CELLS_PER_DEV) + ch + 1); dev * AD7280A_CELLS_PER_DEV + ch + 1);
ad7280_attributes[cnt] = ad7280_attributes[cnt] =
&st->iio_attr[cnt].dev_attr.attr; &st->iio_attr[cnt].dev_attr.attr;
cnt++; cnt++;
...@@ -582,9 +582,10 @@ static int ad7280_attr_init(struct ad7280_state *st) ...@@ -582,9 +582,10 @@ static int ad7280_attr_init(struct ad7280_state *st)
st->iio_attr[cnt].dev_attr.store = st->iio_attr[cnt].dev_attr.store =
ad7280_store_balance_timer; ad7280_store_balance_timer;
st->iio_attr[cnt].dev_attr.attr.name = st->iio_attr[cnt].dev_attr.attr.name =
kasprintf(GFP_KERNEL, "in%d-in%d_balance_timer", kasprintf(GFP_KERNEL,
(dev * AD7280A_CELLS_PER_DEV) + ch, "in%d-in%d_balance_timer",
(dev * AD7280A_CELLS_PER_DEV) + ch + 1); dev * AD7280A_CELLS_PER_DEV + ch,
dev * AD7280A_CELLS_PER_DEV + ch + 1);
ad7280_attributes[cnt] = ad7280_attributes[cnt] =
&st->iio_attr[cnt].dev_attr.attr; &st->iio_attr[cnt].dev_attr.attr;
} }
...@@ -718,7 +719,8 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) ...@@ -718,7 +719,8 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
} else { } else {
if (((channels[i] >> 11) & 0xFFF) >= st->aux_threshhigh) if (((channels[i] >> 11) & 0xFFF) >= st->aux_threshhigh)
iio_push_event(indio_dev, iio_push_event(indio_dev,
IIO_UNMOD_EVENT_CODE(IIO_TEMP, IIO_UNMOD_EVENT_CODE(
IIO_TEMP,
0, 0,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_RISING), IIO_EV_DIR_RISING),
...@@ -726,7 +728,8 @@ static irqreturn_t ad7280_event_handler(int irq, void *private) ...@@ -726,7 +728,8 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
else if (((channels[i] >> 11) & 0xFFF) <= else if (((channels[i] >> 11) & 0xFFF) <=
st->aux_threshlow) st->aux_threshlow)
iio_push_event(indio_dev, iio_push_event(indio_dev,
IIO_UNMOD_EVENT_CODE(IIO_TEMP, IIO_UNMOD_EVENT_CODE(
IIO_TEMP,
0, 0,
IIO_EV_TYPE_THRESH, IIO_EV_TYPE_THRESH,
IIO_EV_DIR_FALLING), IIO_EV_DIR_FALLING),
......
...@@ -117,7 +117,8 @@ static ssize_t ad7606_show_range(struct device *dev, ...@@ -117,7 +117,8 @@ static ssize_t ad7606_show_range(struct device *dev,
} }
static ssize_t ad7606_store_range(struct device *dev, static ssize_t ad7606_store_range(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_state *st = iio_priv(indio_dev);
...@@ -145,7 +146,8 @@ static IIO_DEVICE_ATTR(in_voltage_range, S_IRUGO | S_IWUSR, ...@@ -145,7 +146,8 @@ static IIO_DEVICE_ATTR(in_voltage_range, S_IRUGO | S_IWUSR,
static IIO_CONST_ATTR(in_voltage_range_available, "5000 10000"); static IIO_CONST_ATTR(in_voltage_range_available, "5000 10000");
static ssize_t ad7606_show_oversampling_ratio(struct device *dev, static ssize_t ad7606_show_oversampling_ratio(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr,
char *buf)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_state *st = iio_priv(indio_dev);
...@@ -166,7 +168,8 @@ static int ad7606_oversampling_get_index(unsigned val) ...@@ -166,7 +168,8 @@ static int ad7606_oversampling_get_index(unsigned val)
} }
static ssize_t ad7606_store_oversampling_ratio(struct device *dev, static ssize_t ad7606_store_oversampling_ratio(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr,
const char *buf, size_t count)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7606_state *st = iio_priv(indio_dev); struct ad7606_state *st = iio_priv(indio_dev);
......
...@@ -207,8 +207,10 @@ static int ad7780_probe(struct spi_device *spi) ...@@ -207,8 +207,10 @@ static int ad7780_probe(struct spi_device *spi)
if (pdata && gpio_is_valid(pdata->gpio_pdrst)) { if (pdata && gpio_is_valid(pdata->gpio_pdrst)) {
ret = devm_gpio_request_one(&spi->dev, pdata->gpio_pdrst, ret = devm_gpio_request_one(&spi->dev,
GPIOF_OUT_INIT_LOW, "AD7780 /PDRST"); pdata->gpio_pdrst,
GPIOF_OUT_INIT_LOW,
"AD7780 /PDRST");
if (ret) { if (ret) {
dev_err(&spi->dev, "failed to request GPIO PDRST\n"); dev_err(&spi->dev, "failed to request GPIO PDRST\n");
goto error_disable_reg; goto error_disable_reg;
......
...@@ -471,7 +471,8 @@ static void mxs_lradc_setup_ts_channel(struct mxs_lradc *lradc, unsigned ch) ...@@ -471,7 +471,8 @@ static void mxs_lradc_setup_ts_channel(struct mxs_lradc *lradc, unsigned ch)
* SoC's delay unit and start the conversion later * SoC's delay unit and start the conversion later
* and automatically. * and automatically.
*/ */
mxs_lradc_reg_wrt(lradc, mxs_lradc_reg_wrt(
lradc,
LRADC_DELAY_TRIGGER(0) | /* don't trigger ADC */ LRADC_DELAY_TRIGGER(0) | /* don't trigger ADC */
LRADC_DELAY_TRIGGER_DELAYS(BIT(3)) | /* trigger DELAY unit#3 */ LRADC_DELAY_TRIGGER_DELAYS(BIT(3)) | /* trigger DELAY unit#3 */
LRADC_DELAY_KICK | LRADC_DELAY_KICK |
...@@ -511,7 +512,9 @@ static void mxs_lradc_setup_ts_pressure(struct mxs_lradc *lradc, unsigned ch1, ...@@ -511,7 +512,9 @@ static void mxs_lradc_setup_ts_pressure(struct mxs_lradc *lradc, unsigned ch1,
mxs_lradc_reg_clear(lradc, LRADC_CH_VALUE_MASK, LRADC_CH(ch2)); mxs_lradc_reg_clear(lradc, LRADC_CH_VALUE_MASK, LRADC_CH(ch2));
/* prepare the delay/loop unit according to the oversampling count */ /* prepare the delay/loop unit according to the oversampling count */
mxs_lradc_reg_wrt(lradc, LRADC_DELAY_TRIGGER(1 << ch1) | mxs_lradc_reg_wrt(
lradc,
LRADC_DELAY_TRIGGER(1 << ch1) |
LRADC_DELAY_TRIGGER(1 << ch2) | /* start both channels */ LRADC_DELAY_TRIGGER(1 << ch2) | /* start both channels */
LRADC_DELAY_TRIGGER_DELAYS(0) | LRADC_DELAY_TRIGGER_DELAYS(0) |
LRADC_DELAY_LOOP(lradc->over_sample_cnt - 1) | LRADC_DELAY_LOOP(lradc->over_sample_cnt - 1) |
...@@ -526,7 +529,8 @@ static void mxs_lradc_setup_ts_pressure(struct mxs_lradc *lradc, unsigned ch1, ...@@ -526,7 +529,8 @@ static void mxs_lradc_setup_ts_pressure(struct mxs_lradc *lradc, unsigned ch1,
* SoC's delay unit and start the conversion later * SoC's delay unit and start the conversion later
* and automatically. * and automatically.
*/ */
mxs_lradc_reg_wrt(lradc, mxs_lradc_reg_wrt(
lradc,
LRADC_DELAY_TRIGGER(0) | /* don't trigger ADC */ LRADC_DELAY_TRIGGER(0) | /* don't trigger ADC */
LRADC_DELAY_TRIGGER_DELAYS(BIT(3)) | /* trigger DELAY unit#3 */ LRADC_DELAY_TRIGGER_DELAYS(BIT(3)) | /* trigger DELAY unit#3 */
LRADC_DELAY_KICK | LRADC_DELAY_KICK |
...@@ -690,10 +694,12 @@ static void mxs_lradc_enable_touch_detection(struct mxs_lradc *lradc) ...@@ -690,10 +694,12 @@ static void mxs_lradc_enable_touch_detection(struct mxs_lradc *lradc)
static void mxs_lradc_start_touch_event(struct mxs_lradc *lradc) static void mxs_lradc_start_touch_event(struct mxs_lradc *lradc)
{ {
mxs_lradc_reg_clear(lradc, LRADC_CTRL1_TOUCH_DETECT_IRQ_EN, mxs_lradc_reg_clear(lradc,
LRADC_CTRL1_TOUCH_DETECT_IRQ_EN,
LRADC_CTRL1); LRADC_CTRL1);
mxs_lradc_reg_set(lradc, mxs_lradc_reg_set(lradc,
LRADC_CTRL1_LRADC_IRQ_EN(TOUCHSCREEN_VCHANNEL1), LRADC_CTRL1); LRADC_CTRL1_LRADC_IRQ_EN(TOUCHSCREEN_VCHANNEL1),
LRADC_CTRL1);
/* /*
* start with the Y-pos, because it uses nearly the same plate * start with the Y-pos, because it uses nearly the same plate
* settings like the touch detection * settings like the touch detection
...@@ -721,8 +727,10 @@ static void mxs_lradc_complete_touch_event(struct mxs_lradc *lradc) ...@@ -721,8 +727,10 @@ static void mxs_lradc_complete_touch_event(struct mxs_lradc *lradc)
mxs_lradc_reg_wrt(lradc, 0, LRADC_CH(TOUCHSCREEN_VCHANNEL1)); mxs_lradc_reg_wrt(lradc, 0, LRADC_CH(TOUCHSCREEN_VCHANNEL1));
mxs_lradc_reg_clear(lradc, mxs_lradc_reg_clear(lradc,
LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL1) | LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL1) |
LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL2), LRADC_CTRL1); LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL2),
mxs_lradc_reg_wrt(lradc, LRADC_CTRL1);
mxs_lradc_reg_wrt(
lradc,
LRADC_DELAY_TRIGGER(1 << TOUCHSCREEN_VCHANNEL1) | LRADC_DELAY_TRIGGER(1 << TOUCHSCREEN_VCHANNEL1) |
LRADC_DELAY_KICK | LRADC_DELAY_DELAY(10), /* waste 5 ms */ LRADC_DELAY_KICK | LRADC_DELAY_DELAY(10), /* waste 5 ms */
LRADC_DELAY(2)); LRADC_DELAY(2));
...@@ -757,9 +765,11 @@ static void mxs_lradc_finish_touch_event(struct mxs_lradc *lradc, bool valid) ...@@ -757,9 +765,11 @@ static void mxs_lradc_finish_touch_event(struct mxs_lradc *lradc, bool valid)
lradc->cur_plate = LRADC_TOUCH; lradc->cur_plate = LRADC_TOUCH;
mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(2)); mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(2));
mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(3)); mxs_lradc_reg_wrt(lradc, 0, LRADC_DELAY(3));
mxs_lradc_reg_clear(lradc, LRADC_CTRL1_TOUCH_DETECT_IRQ | mxs_lradc_reg_clear(lradc,
LRADC_CTRL1_TOUCH_DETECT_IRQ |
LRADC_CTRL1_LRADC_IRQ_EN(TOUCHSCREEN_VCHANNEL1) | LRADC_CTRL1_LRADC_IRQ_EN(TOUCHSCREEN_VCHANNEL1) |
LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL1), LRADC_CTRL1); LRADC_CTRL1_LRADC_IRQ(TOUCHSCREEN_VCHANNEL1),
LRADC_CTRL1);
mxs_lradc_reg_set(lradc, LRADC_CTRL1_TOUCH_DETECT_IRQ_EN, LRADC_CTRL1); mxs_lradc_reg_set(lradc, LRADC_CTRL1_TOUCH_DETECT_IRQ_EN, LRADC_CTRL1);
} }
...@@ -775,19 +785,22 @@ static void mxs_lradc_handle_touch(struct mxs_lradc *lradc) ...@@ -775,19 +785,22 @@ static void mxs_lradc_handle_touch(struct mxs_lradc *lradc)
return; return;
case LRADC_SAMPLE_Y: case LRADC_SAMPLE_Y:
lradc->ts_y_pos = mxs_lradc_read_raw_channel(lradc, lradc->ts_y_pos =
mxs_lradc_read_raw_channel(lradc,
TOUCHSCREEN_VCHANNEL1); TOUCHSCREEN_VCHANNEL1);
mxs_lradc_prepare_x_pos(lradc); mxs_lradc_prepare_x_pos(lradc);
return; return;
case LRADC_SAMPLE_X: case LRADC_SAMPLE_X:
lradc->ts_x_pos = mxs_lradc_read_raw_channel(lradc, lradc->ts_x_pos =
mxs_lradc_read_raw_channel(lradc,
TOUCHSCREEN_VCHANNEL1); TOUCHSCREEN_VCHANNEL1);
mxs_lradc_prepare_pressure(lradc); mxs_lradc_prepare_pressure(lradc);
return; return;
case LRADC_SAMPLE_PRESSURE: case LRADC_SAMPLE_PRESSURE:
lradc->ts_pressure = mxs_lradc_read_ts_pressure(lradc, lradc->ts_pressure =
mxs_lradc_read_ts_pressure(lradc,
TOUCHSCREEN_VCHANNEL2, TOUCHSCREEN_VCHANNEL2,
TOUCHSCREEN_VCHANNEL1); TOUCHSCREEN_VCHANNEL1);
mxs_lradc_complete_touch_event(lradc); mxs_lradc_complete_touch_event(lradc);
...@@ -831,11 +844,13 @@ static int mxs_lradc_read_single(struct iio_dev *iio_dev, int chan, int *val) ...@@ -831,11 +844,13 @@ static int mxs_lradc_read_single(struct iio_dev *iio_dev, int chan, int *val)
/* Enable / disable the divider per requirement */ /* Enable / disable the divider per requirement */
if (test_bit(chan, &lradc->is_divided)) if (test_bit(chan, &lradc->is_divided))
mxs_lradc_reg_set(lradc, 1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET, mxs_lradc_reg_set(lradc,
1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
LRADC_CTRL2); LRADC_CTRL2);
else else
mxs_lradc_reg_clear(lradc, mxs_lradc_reg_clear(lradc,
1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET, LRADC_CTRL2); 1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
LRADC_CTRL2);
/* Clean the slot's previous content, then set new one. */ /* Clean the slot's previous content, then set new one. */
mxs_lradc_reg_clear(lradc, LRADC_CTRL4_LRADCSELECT_MASK(0), mxs_lradc_reg_clear(lradc, LRADC_CTRL4_LRADCSELECT_MASK(0),
...@@ -1274,7 +1289,8 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio) ...@@ -1274,7 +1289,8 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
} }
if (lradc->soc == IMX28_LRADC) if (lradc->soc == IMX28_LRADC)
mxs_lradc_reg_clear(lradc, mxs_lradc_reg_clear(
lradc,
lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET, lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET,
LRADC_CTRL1); LRADC_CTRL1);
mxs_lradc_reg_clear(lradc, lradc->buffer_vchans, LRADC_CTRL0); mxs_lradc_reg_clear(lradc, lradc->buffer_vchans, LRADC_CTRL0);
...@@ -1312,7 +1328,8 @@ static int mxs_lradc_buffer_postdisable(struct iio_dev *iio) ...@@ -1312,7 +1328,8 @@ static int mxs_lradc_buffer_postdisable(struct iio_dev *iio)
mxs_lradc_reg_clear(lradc, lradc->buffer_vchans, LRADC_CTRL0); mxs_lradc_reg_clear(lradc, lradc->buffer_vchans, LRADC_CTRL0);
if (lradc->soc == IMX28_LRADC) if (lradc->soc == IMX28_LRADC)
mxs_lradc_reg_clear(lradc, mxs_lradc_reg_clear(
lradc,
lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET, lradc->buffer_vchans << LRADC_CTRL1_LRADC_IRQ_EN_OFFSET,
LRADC_CTRL1); LRADC_CTRL1);
......
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