aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavishankar <ravi.shankar@greenturtles.in>2011-07-08 07:08:31 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-08 17:11:17 -0400
commit7a98161646f98690d845fd599dc840cd7d765aad (patch)
treebc95eabb54cd05087f8b886efc2c47d30890eb49
parent5fa88f3873e2d0afde618566d31e936a150be62a (diff)
Staging: comedi: fix line over 80 character issue in rtd520.c
This is a patch to the rtd520.c file that fixes up a warning: line over 80 character found by the checkpatch.pl tool Signed-off-by: Ravishankar <ravishankarkm32@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/rtd520.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 7f09ed755fe6..f2f877b33737 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1026,7 +1026,8 @@ static int rtd_attach(struct comedi_device *dev, struct comedi_devconfig *it)
1026 } 1026 }
1027 1027
1028 RtdDma0Mode(dev, DMA_MODE_BITS); 1028 RtdDma0Mode(dev, DMA_MODE_BITS);
1029 RtdDma0Source(dev, DMAS_ADFIFO_HALF_FULL); /* set DMA trigger source */ 1029 /* set DMA trigger source */
1030 RtdDma0Source(dev, DMAS_ADFIFO_HALF_FULL);
1030 } else { 1031 } else {
1031 printk(KERN_INFO "( no IRQ->no DMA )"); 1032 printk(KERN_INFO "( no IRQ->no DMA )");
1032 } 1033 }
@@ -1202,11 +1203,13 @@ static unsigned short rtdConvertChanGain(struct comedi_device *dev,
1202 CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex); 1203 CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex);
1203 } else if (range < thisboard->rangeUniStart) { /* second batch are +-10 */ 1204 } else if (range < thisboard->rangeUniStart) { /* second batch are +-10 */
1204 r |= 0x100; /* +-10 range */ 1205 r |= 0x100; /* +-10 range */
1205 r |= ((range - thisboard->range10Start) & 0x7) << 4; /* gain */ 1206 /* gain */
1207 r |= ((range - thisboard->range10Start) & 0x7) << 4;
1206 CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex); 1208 CHAN_ARRAY_SET(devpriv->chanBipolar, chanIndex);
1207 } else { /* last batch is +10 */ 1209 } else { /* last batch is +10 */
1208 r |= 0x200; /* +10 range */ 1210 r |= 0x200; /* +10 range */
1209 r |= ((range - thisboard->rangeUniStart) & 0x7) << 4; /* gain */ 1211 /* gain */
1212 r |= ((range - thisboard->rangeUniStart) & 0x7) << 4;
1210 CHAN_ARRAY_CLEAR(devpriv->chanBipolar, chanIndex); 1213 CHAN_ARRAY_CLEAR(devpriv->chanBipolar, chanIndex);
1211 } 1214 }
1212 1215
@@ -1336,7 +1339,8 @@ static int rtd_ai_rinsn(struct comedi_device *dev,
1336 /*printk ("rtd520: Got 0x%x after %d usec\n", d, ii+1); */ 1339 /*printk ("rtd520: Got 0x%x after %d usec\n", d, ii+1); */
1337 d = d >> 3; /* low 3 bits are marker lines */ 1340 d = d >> 3; /* low 3 bits are marker lines */
1338 if (CHAN_ARRAY_TEST(devpriv->chanBipolar, 0)) 1341 if (CHAN_ARRAY_TEST(devpriv->chanBipolar, 0))
1339 data[n] = d + 2048; /* convert to comedi unsigned data */ 1342 /* convert to comedi unsigned data */
1343 data[n] = d + 2048;
1340 else 1344 else
1341 data[n] = d; 1345 data[n] = d;
1342 } 1346 }