redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

Staging: comedi: pcl711: Checkpatch cleanups

Browse source 
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>
This commit is contained in:
Benjamin Adolphi 2010-01-16 18:58:58 +01:00 committed by Greg Kroah-Hartman
parent f51f903000
commit 266bfbdd3e
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/staging/comedi/drivers/pcl711.c
View file

@ -207,11 +207,10 @@ static irqreturn_t pcl711_interrupt(int irq, void *d)
/* FIXME! Nothing else sets ntrig! */ /* FIXME! Nothing else sets ntrig! */
if (!(--devpriv->ntrig)) { if (!(--devpriv->ntrig)) {
if (this_board->is_8112) { if (this_board->is_8112)
outb(1, dev->iobase + PCL711_MODE); outb(1, dev->iobase + PCL711_MODE);
} else { else
outb(0, dev->iobase + PCL711_MODE); outb(0, dev->iobase + PCL711_MODE);
}
s->async->events |= COMEDI_CB_EOA; s->async->events |= COMEDI_CB_EOA;
} }
@ -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 * Set the correct channel. The two channel banks are switched
* using the mask value. * using the mask value.
* NB: To use differential channels, you should use mask = 0x30, * NB: To use differential channels, you should use
* but I haven't written the support for this yet. /JJ * 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); chan_register = 0x20 | (chan_register & 0x7);
} else { else
chan_register |= 0x10; chan_register |= 0x10;
}
} else { } else {
outb(chan_register, dev->iobase + PCL711_MUX); outb(chan_register, dev->iobase + PCL711_MUX);
} }
@ -256,15 +255,13 @@ static int pcl711_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
for (n = 0; n < insn->n; n++) { for (n = 0; n < insn->n; n++) {
/* /*
* Write the correct mode (software polling) and start polling by writing * Write the correct mode (software polling) and start polling
* to the trigger register * by writing to the trigger register
*/ */
outb(1, dev->iobase + PCL711_MODE); outb(1, dev->iobase + PCL711_MODE);
if (this_board->is_8112) { if (!this_board->is_8112)
} else {
outb(0, dev->iobase + PCL711_SOFTTRIG); outb(0, dev->iobase + PCL711_SOFTTRIG);
}
i = PCL711_TIMEOUT; i = PCL711_TIMEOUT;
while (--i) { while (--i) {
@ -462,9 +459,8 @@ static int pcl711_ao_insn_read(struct comedi_device *dev,
int n; int n;
int chan = CR_CHAN(insn->chanspec); 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]; data[n] = devpriv->ao_readback[chan];
}
return n; return n;
@ -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 this is the "base value" for the mode register, which is
used for the irq on the PCL711 used for the irq on the PCL711
*/ */
if (this_board->is_pcl711b) { if (this_board->is_pcl711b)
devpriv->mode = (dev->irq << 4); devpriv->mode = (dev->irq << 4);
}
/* clear DAC */ /* clear DAC */
outb(0, dev->iobase + PCL711_DA0_LO); outb(0, dev->iobase + PCL711_DA0_LO);