aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAybuke Ozdemir <aybuke.147@gmail.com>2014-03-19 12:44:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-03-19 16:41:27 -0400
commit168934c9d4e7a58e2e6162976fd49e528b26cee4 (patch)
tree4e8efcc7c96285e3b3ea9eb9f196d166f56a03ae
parent88005c5fc01ac01bff18a7d1004ff5a850d162ac (diff)
staging: adc: mxs-lradc.c Fix line over 80 characters.
Fix checkpatch.pl issues with line over 80 characters in mxs-lradc.c Signed-off-by: Aybuke Ozdemir <aybuke.147@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/iio/adc/mxs-lradc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index 25bea0556c1e..11fb95201545 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -847,7 +847,8 @@ static int mxs_lradc_read_single(struct iio_dev *iio_dev, int chan, int *val)
847 mxs_lradc_reg_clear(lradc, 0xff, LRADC_CTRL0); 847 mxs_lradc_reg_clear(lradc, 0xff, LRADC_CTRL0);
848 848
849 /* Clean the slot's previous content, then set new one. */ 849 /* Clean the slot's previous content, then set new one. */
850 mxs_lradc_reg_clear(lradc, LRADC_CTRL4_LRADCSELECT_MASK(0), LRADC_CTRL4); 850 mxs_lradc_reg_clear(lradc, LRADC_CTRL4_LRADCSELECT_MASK(0),
851 LRADC_CTRL4);
851 mxs_lradc_reg_set(lradc, chan, LRADC_CTRL4); 852 mxs_lradc_reg_set(lradc, chan, LRADC_CTRL4);
852 853
853 mxs_lradc_reg_wrt(lradc, 0, LRADC_CH(0)); 854 mxs_lradc_reg_wrt(lradc, 0, LRADC_CH(0));
@@ -1169,7 +1170,8 @@ static irqreturn_t mxs_lradc_handle_irq(int irq, void *data)
1169 else if (reg & LRADC_CTRL1_LRADC_IRQ(0)) 1170 else if (reg & LRADC_CTRL1_LRADC_IRQ(0))
1170 complete(&lradc->completion); 1171 complete(&lradc->completion);
1171 1172
1172 mxs_lradc_reg_clear(lradc, reg & mxs_lradc_irq_mask(lradc), LRADC_CTRL1); 1173 mxs_lradc_reg_clear(lradc, reg & mxs_lradc_irq_mask(lradc),
1174 LRADC_CTRL1);
1173 1175
1174 return IRQ_HANDLED; 1176 return IRQ_HANDLED;
1175} 1177}
@@ -1260,7 +1262,8 @@ static int mxs_lradc_buffer_preenable(struct iio_dev *iio)
1260 uint32_t ctrl1_irq = 0; 1262 uint32_t ctrl1_irq = 0;
1261 const uint32_t chan_value = LRADC_CH_ACCUMULATE | 1263 const uint32_t chan_value = LRADC_CH_ACCUMULATE |
1262 ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET); 1264 ((LRADC_DELAY_TIMER_LOOP - 1) << LRADC_CH_NUM_SAMPLES_OFFSET);
1263 const int len = bitmap_weight(iio->active_scan_mask, LRADC_MAX_TOTAL_CHANS); 1265 const int len = bitmap_weight(iio->active_scan_mask,
1266 LRADC_MAX_TOTAL_CHANS);
1264 1267
1265 if (!len) 1268 if (!len)
1266 return -EINVAL; 1269 return -EINVAL;