Skip to content

Commit

Permalink
Staging: comedi: pcl711: Checkpatch cleanups
Browse files Browse the repository at this point in the history
This fixes some checkpatch issues in the pcl711 comedi driver.

Signed-off-by: Benjamin Adolphi <b.adolphi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Benjamin Adolphi authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent f51f903 commit 266bfbd
Showing 1 changed file with 12 additions and 17 deletions.
29 changes: 12 additions & 17 deletions drivers/staging/comedi/drivers/pcl711.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,10 @@ static irqreturn_t pcl711_interrupt(int irq, void *d)

/* FIXME! Nothing else sets ntrig! */
if (!(--devpriv->ntrig)) {
if (this_board->is_8112) {
if (this_board->is_8112)
outb(1, dev->iobase + PCL711_MODE);
} else {
else
outb(0, dev->iobase + PCL711_MODE);
}

s->async->events |= COMEDI_CB_EOA;
}
Expand All @@ -232,15 +231,15 @@ static void pcl711_set_changain(struct comedi_device *dev, int chan)
/*
* Set the correct channel. The two channel banks are switched
* using the mask value.
* NB: To use differential channels, you should use mask = 0x30,
* but I haven't written the support for this yet. /JJ
* NB: To use differential channels, you should use
* mask = 0x30, but I haven't written the support for this
* yet. /JJ
*/

if (chan_register >= 8) {
if (chan_register >= 8)
chan_register = 0x20 | (chan_register & 0x7);
} else {
else
chan_register |= 0x10;
}
} else {
outb(chan_register, dev->iobase + PCL711_MUX);
}
Expand All @@ -256,15 +255,13 @@ static int pcl711_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,

for (n = 0; n < insn->n; n++) {
/*
* Write the correct mode (software polling) and start polling by writing
* to the trigger register
* Write the correct mode (software polling) and start polling
* by writing to the trigger register
*/
outb(1, dev->iobase + PCL711_MODE);

if (this_board->is_8112) {
} else {
if (!this_board->is_8112)
outb(0, dev->iobase + PCL711_SOFTTRIG);
}

i = PCL711_TIMEOUT;
while (--i) {
Expand Down Expand Up @@ -462,9 +459,8 @@ static int pcl711_ao_insn_read(struct comedi_device *dev,
int n;
int chan = CR_CHAN(insn->chanspec);

for (n = 0; n < insn->n; n++) {
for (n = 0; n < insn->n; n++)
data[n] = devpriv->ao_readback[chan];
}

return n;

Expand Down Expand Up @@ -619,9 +615,8 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
this is the "base value" for the mode register, which is
used for the irq on the PCL711
*/
if (this_board->is_pcl711b) {
if (this_board->is_pcl711b)
devpriv->mode = (dev->irq << 4);
}

/* clear DAC */
outb(0, dev->iobase + PCL711_DA0_LO);
Expand Down

0 comments on commit 266bfbd

Please sign in to comment.