p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

staging: comedi: ni_mio_common: tidy up ni_8255_callback() 

The 8255 driver (*io) callback now includes the comedi_device pointer.

Instead of passing the (cast) pointer to subdev_8255_init(), pass the
'iobase' of the 8255 registers (Port_A).

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 2014-08-12 11:41:20 -07:00 committed by Greg Kroah-Hartman
parent 09d6dd7490
commit 67393c4fef
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@ -4176,17 +4176,15 @@ static int ni_freq_out_insn_config(struct comedi_device *dev,
return insn->n;
}
static int ni_8255_callback(struct comedi_device *cdev,
int dir, int port, int data, unsigned long arg)
static int ni_8255_callback(struct comedi_device *dev,
int dir, int port, int data, unsigned long iobase)
{
struct comedi_device *dev = (struct comedi_device *)arg;
if (dir) {
ni_writeb(dev, data, Port_A + 2 * port);
ni_writeb(dev, data, iobase + 2 * port);
return 0;
}
return ni_readb(dev, Port_A + 2 * port);
return ni_readb(dev, iobase + 2 * port);
}
static int ni_get_pwm_config(struct comedi_device *dev, unsigned int *data)
@ -5561,8 +5559,7 @@ static int ni_E_init(struct comedi_device *dev,
/* 8255 device */
s = &dev->subdevices[NI_8255_DIO_SUBDEV];
if (board->has_8255) {
ret = subdev_8255_init(dev, s, ni_8255_callback,
(unsigned long)dev);
ret = subdev_8255_init(dev, s, ni_8255_callback, Port_A);
if (ret)
return ret;
} else {