aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Melin <tomas.melin@iki.fi>2012-05-02 12:15:17 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-02 18:55:27 -0400
commit61cd983c4c312b6a679f7ee3ba31aec20c044a41 (patch)
treeaf8f7340092ffb9e0729db1dd90c83e0d53c3c96
parent204162572ff4a679a47c68a5d5b3ac2bcba3830e (diff)
Staging: Comedi adv_pci1710 : Corrected over 80 column warnings
Indentation problems aswell as various comments and code lines longer than 80 chars fixed in file adv_pci1710.c Signed-off-by: Tomas Melin <tomas.melin@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/adv_pci1710.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 9eaae0d18d1f..f3f6a655e807 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1222,14 +1222,14 @@ static void setup_channel_list(struct comedi_device *dev,
1222 DPRINTK("SegLen: %d\n", seglen); 1222 DPRINTK("SegLen: %d\n", seglen);
1223 for (i = 0; i < seglen; i++) { /* store range list to card */ 1223 for (i = 0; i < seglen; i++) { /* store range list to card */
1224 chanprog = muxonechan[CR_CHAN(chanlist[i])]; 1224 chanprog = muxonechan[CR_CHAN(chanlist[i])];
1225 outw(chanprog, dev->iobase + PCI171x_MUX); /* select channel */ 1225 outw(chanprog, dev->iobase + PCI171x_MUX); /* select channel */
1226 range = this_board->rangecode_ai[CR_RANGE(chanlist[i])]; 1226 range = this_board->rangecode_ai[CR_RANGE(chanlist[i])];
1227 if (CR_AREF(chanlist[i]) == AREF_DIFF) 1227 if (CR_AREF(chanlist[i]) == AREF_DIFF)
1228 range |= 0x0020; 1228 range |= 0x0020;
1229 outw(range, dev->iobase + PCI171x_RANGE); /* select gain */ 1229 outw(range, dev->iobase + PCI171x_RANGE); /* select gain */
1230#ifdef PCI171x_PARANOIDCHECK 1230#ifdef PCI171x_PARANOIDCHECK
1231 devpriv->act_chanlist[i] = 1231 devpriv->act_chanlist[i] =
1232 (CR_CHAN(chanlist[i]) << 12) & 0xf000; 1232 (CR_CHAN(chanlist[i]) << 12) & 0xf000;
1233#endif 1233#endif
1234 DPRINTK("GS: %2d. [%4x]=%4x %4x\n", i, chanprog, range, 1234 DPRINTK("GS: %2d. [%4x]=%4x %4x\n", i, chanprog, range,
1235 devpriv->act_chanlist[i]); 1235 devpriv->act_chanlist[i]);
@@ -1237,13 +1237,14 @@ static void setup_channel_list(struct comedi_device *dev,
1237#ifdef PCI171x_PARANOIDCHECK 1237#ifdef PCI171x_PARANOIDCHECK
1238 for ( ; i < n_chan; i++) { /* store remainder of channel list */ 1238 for ( ; i < n_chan; i++) { /* store remainder of channel list */
1239 devpriv->act_chanlist[i] = 1239 devpriv->act_chanlist[i] =
1240 (CR_CHAN(chanlist[i]) << 12) & 0xf000; 1240 (CR_CHAN(chanlist[i]) << 12) & 0xf000;
1241 } 1241 }
1242#endif 1242#endif
1243 1243
1244 devpriv->ai_et_MuxVal = 1244 devpriv->ai_et_MuxVal =
1245 CR_CHAN(chanlist[0]) | (CR_CHAN(chanlist[seglen - 1]) << 8); 1245 CR_CHAN(chanlist[0]) | (CR_CHAN(chanlist[seglen - 1]) << 8);
1246 outw(devpriv->ai_et_MuxVal, dev->iobase + PCI171x_MUX); /* select channel interval to scan */ 1246 /* select channel interval to scan */
1247 outw(devpriv->ai_et_MuxVal, dev->iobase + PCI171x_MUX);
1247 DPRINTK("MUX: %4x L%4x.H%4x\n", 1248 DPRINTK("MUX: %4x L%4x.H%4x\n",
1248 CR_CHAN(chanlist[0]) | (CR_CHAN(chanlist[seglen - 1]) << 8), 1249 CR_CHAN(chanlist[0]) | (CR_CHAN(chanlist[seglen - 1]) << 8),
1249 CR_CHAN(chanlist[0]), CR_CHAN(chanlist[seglen - 1])); 1250 CR_CHAN(chanlist[0]), CR_CHAN(chanlist[seglen - 1]));