github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 10:41:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: comedi: ni_labpc: tidy up labpc_8255_mmio()

Browse Source 
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 (DIO_BASE_REG).

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:21 -07:00 committed by Greg Kroah-Hartman
parent 67393c4fef
commit ed8c80d0a4
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1035,17 +1035,15 @@ static int labpc_ao_insn_read(struct comedi_device *dev,
return 1;
}
static int labpc_8255_mmio(struct comedi_device *cdev,
int dir, int port, int data, unsigned long arg)
static int labpc_8255_mmio(struct comedi_device *dev,
int dir, int port, int data, unsigned long iobase)
{
struct comedi_device *dev = (struct comedi_device *)arg;
if (dir) {
writeb(data, dev->mmio + DIO_BASE_REG + port);
writeb(data, dev->mmio + iobase + port);
return 0;
}
return readb(dev->mmio + DIO_BASE_REG + port);
return readb(dev->mmio + iobase + port);
}
/* lowlevel write to eeprom/dac */
@ -1405,7 +1403,7 @@ int labpc_common_attach(struct comedi_device *dev,
s = &dev->subdevices[2];
if (dev->mmio) {
ret = subdev_8255_init(dev, s, labpc_8255_mmio,
(unsigned long)dev);
DIO_BASE_REG);
} else {
ret = subdev_8255_init(dev, s, NULL,
dev->iobase + DIO_BASE_REG);