From a40cff7e3d514441e5586a09531ee55462a8baba Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 31 Aug 2012 20:41:39 +0100 Subject: [PATCH] --- yaml --- r: 324661 b: refs/heads/master c: 4d31848a737206fc2d309aa4f37c4f390182fda2 h: refs/heads/master i: 324659: c27657ea58ea7e061afb63e6ee2092f3f78adebb v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/das08.c | 24 +++++++++++--------- trunk/drivers/staging/comedi/drivers/das08.h | 1 - 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 61ac8a89b199..2132467712b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb8ff5d501e8b461d604db941673efbc7dc9d347 +refs/heads/master: 4d31848a737206fc2d309aa4f37c4f390182fda2 diff --git a/trunk/drivers/staging/comedi/drivers/das08.c b/trunk/drivers/staging/comedi/drivers/das08.c index 9d33b5aed8ab..9a97bc2aa2f1 100644 --- a/trunk/drivers/staging/comedi/drivers/das08.c +++ b/trunk/drivers/staging/comedi/drivers/das08.c @@ -425,22 +425,24 @@ das08ao_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, static void i8254_initialize(struct comedi_device *dev) { - struct das08_private_struct *devpriv = dev->private; + const struct das08_board_struct *thisboard = comedi_board(dev); + unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; unsigned int mode = I8254_MODE0 | I8254_BINARY; int i; for (i = 0; i < 3; ++i) - i8254_set_mode(devpriv->i8254_iobase, 0, i, mode); + i8254_set_mode(i8254_iobase, 0, i, mode); } static int das08_counter_read(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct das08_private_struct *devpriv = dev->private; + const struct das08_board_struct *thisboard = comedi_board(dev); + unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; int chan = insn->chanspec; - data[0] = i8254_read(devpriv->i8254_iobase, 0, chan); + data[0] = i8254_read(i8254_iobase, 0, chan); return 1; } @@ -448,10 +450,11 @@ static int das08_counter_write(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct das08_private_struct *devpriv = dev->private; + const struct das08_board_struct *thisboard = comedi_board(dev); + unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; int chan = insn->chanspec; - i8254_write(devpriv->i8254_iobase, 0, chan, data[0]); + i8254_write(i8254_iobase, 0, chan, data[0]); return 1; } @@ -459,7 +462,8 @@ static int das08_counter_config(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct das08_private_struct *devpriv = dev->private; + const struct das08_board_struct *thisboard = comedi_board(dev); + unsigned long i8254_iobase = dev->iobase + thisboard->i8254_offset; int chan = insn->chanspec; if (insn->n != 2) @@ -467,10 +471,10 @@ static int das08_counter_config(struct comedi_device *dev, switch (data[0]) { case INSN_CONFIG_SET_COUNTER_MODE: - i8254_set_mode(devpriv->i8254_iobase, 0, chan, data[1]); + i8254_set_mode(i8254_iobase, 0, chan, data[1]); break; case INSN_CONFIG_8254_READ_STATUS: - data[1] = i8254_status(devpriv->i8254_iobase, 0, chan); + data[1] = i8254_status(i8254_iobase, 0, chan); break; default: return -EINVAL; @@ -734,8 +738,6 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase) s->insn_read = das08_counter_read; s->insn_write = das08_counter_write; s->insn_config = das08_counter_config; - - devpriv->i8254_iobase = iobase + thisboard->i8254_offset; i8254_initialize(dev); } else { s->type = COMEDI_SUBD_UNUSED; diff --git a/trunk/drivers/staging/comedi/drivers/das08.h b/trunk/drivers/staging/comedi/drivers/das08.h index af3024ee6de3..5a339934f1ba 100644 --- a/trunk/drivers/staging/comedi/drivers/das08.h +++ b/trunk/drivers/staging/comedi/drivers/das08.h @@ -52,7 +52,6 @@ struct das08_private_struct { unsigned int do_bits; /* bits for do register on boards with register dedicated to digital out only */ const unsigned int *pg_gainlist; struct pci_dev *pdev; /* struct for pci-das08 */ - unsigned int i8254_iobase; }; int das08_common_attach(struct comedi_device *dev, unsigned long iobase);