mirror/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: comedi_parport: remove 'a_data' from private data

Browse Source 
Use the subdevice s->state to hold the current state of the data register
outputs instead of carrying it in the private data.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2013-08-30 11:44:43 -07:00
committed by Greg Kroah-Hartman
parent 5790b4279b
commit 9f1a0909de
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/comedi/drivers/comedi_parport.c
View File

@@ -92,7 +92,6 @@ pin, which can be used to wake up tasks.
#define PARPORT_CTRL_BIDIR_ENA (1 << 5)
struct parport_private {
unsigned int a_data;
unsigned int c_data;
int enable_irq;
};
@@ -100,13 +99,11 @@ struct parport_private {
static int parport_insn_a(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
struct parport_private *devpriv = dev->private;
if (data[0]) {
devpriv->a_data &= ~data[0];
devpriv->a_data |= (data[0] & data[1]);
s->state &= ~data[0];
s->state |= (data[0] & data[1]);
outb(devpriv->a_data, dev->iobase + PARPORT_DATA_REG);
outb(s->state, dev->iobase + PARPORT_DATA_REG);
}
data[1] = inb(dev->iobase + PARPORT_DATA_REG);
@@ -327,8 +324,7 @@ static int parport_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED;
}
devpriv->a_data = 0;
outb(devpriv->a_data, dev->iobase + PARPORT_DATA_REG);
outb(0, dev->iobase + PARPORT_DATA_REG);
devpriv->c_data = 0;
outb(devpriv->c_data, dev->iobase + PARPORT_CTRL_REG);