renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
Code

staging: comedi: das_08: remove the 8254 'logic2phys' usage

Browse Source 
The three 8254 timers have a 1:1 relationship to the comedi
channels. The 'logic2phys' usage just makes the driver more
complex.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-06-29 11:00:40 -07:00 committed by Greg Kroah-Hartman
parent cba9d4aa4e
commit 6daf1e0547
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,7 @@ static int das08_counter_read(struct comedi_device *dev,
{ {
struct das08_private_struct *devpriv = dev->private; struct das08_private_struct *devpriv = dev->private;
struct i8254_struct *st = &devpriv->i8254; struct i8254_struct *st = &devpriv->i8254;
int chan = st->logic2phys[insn->chanspec]; int chan = insn->chanspec;
data[0] = i8254_read(st->iobase, 0, chan); data[0] = i8254_read(st->iobase, 0, chan);
return 1; return 1;
@ -460,7 +460,7 @@ static int das08_counter_write(struct comedi_device *dev,
{ {
struct das08_private_struct *devpriv = dev->private; struct das08_private_struct *devpriv = dev->private;
struct i8254_struct *st = &devpriv->i8254; struct i8254_struct *st = &devpriv->i8254;
int chan = st->logic2phys[insn->chanspec]; int chan = insn->chanspec;
i8254_write(st->iobase, 0, chan, data[0]); i8254_write(st->iobase, 0, chan, data[0]);
return 1; return 1;
@ -472,7 +472,7 @@ static int das08_counter_config(struct comedi_device *dev,
{ {
struct das08_private_struct *devpriv = dev->private; struct das08_private_struct *devpriv = dev->private;
struct i8254_struct *st = &devpriv->i8254; struct i8254_struct *st = &devpriv->i8254;
int chan = st->logic2phys[insn->chanspec]; int chan = insn->chanspec;
if (insn->n != 2) if (insn->n != 2)
return -EINVAL; return -EINVAL;
@ -848,9 +848,6 @@ int das08_common_attach(struct comedi_device *dev, unsigned long iobase)
s->insn_config = das08_counter_config; s->insn_config = das08_counter_config;
/* Set-up the 8254 structure */ /* Set-up the 8254 structure */
devpriv->i8254.channels = 3; devpriv->i8254.channels = 3;
devpriv->i8254.logic2phys[0] = 0;
devpriv->i8254.logic2phys[1] = 1;
devpriv->i8254.logic2phys[2] = 2;
devpriv->i8254.iobase = iobase + thisboard->i8254_offset; devpriv->i8254.iobase = iobase + thisboard->i8254_offset;
i8254_initialize(&devpriv->i8254); i8254_initialize(&devpriv->i8254);
} else { } else {