mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 16:07:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: das08: remove do_bits from private data

Browse Source 
Use the subdevice 'state' variable instead of carrying the state of
the output channels in the private data.

Use comedi_dio_update_state() to handle the boilerplate code to update
the subdevice s->state.

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:07:17 -07:00
committed by Greg Kroah-Hartman
parent 6f617e544b
commit ebf33d0479
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/drivers/das08.c
View File

@@ -316,17 +316,13 @@ static int das08jr_di_rbits(struct comedi_device *dev,
static int das08jr_do_wbits(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
struct comedi_insn *insn,
unsigned int *data)
{
struct das08_private_struct *devpriv = dev->private;
if (comedi_dio_update_state(s, data))
outb(s->state, dev->iobase + DAS08JR_DIO);
/* null bits we are going to set */
devpriv->do_bits &= ~data[0];
/* set new bit values */
devpriv->do_bits |= data[0] & data[1];
outb(devpriv->do_bits, dev->iobase + DAS08JR_DIO);
data[1] = devpriv->do_bits;
data[1] = s->state;
return insn->n;
}

1
drivers/staging/comedi/drivers/das08.h
View File

@@ -41,7 +41,6 @@ struct das08_board_struct {
struct das08_private_struct {
unsigned int do_mux_bits; /* bits for do/mux register on boards without separate do register */
unsigned int do_bits; /* bits for do register on boards with register dedicated to digital out only */
const unsigned int *pg_gainlist;
unsigned int ao_readback[2]; /* assume 2 AO channels */
};