evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: ni_labpc: refactor labpc_8255_mmio()

Browse source 
Refactor the 8255 support code in preperation for using the comedi_device
'mmio' member.

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-07-29 15:01:42 -07:00 • committed by Greg Kroah-Hartman
parent 7c555f06fb
commit adcd16a298
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/staging/comedi/drivers/ni_labpc.c
View file

@ -1048,14 +1048,17 @@ static int labpc_ao_insn_read(struct comedi_device *dev,
return 1; return 1;
} }
static int labpc_8255_mmio(int dir, int port, int data, unsigned long iobase) static int labpc_8255_mmio(int dir, int port, int data, unsigned long arg)
{ {
struct comedi_device *dev = (struct comedi_device *)arg;
void __iomem *mmio = (void __iomem *)dev->iobase + DIO_BASE_REG;
if (dir) { if (dir) {
writeb(data, (void __iomem *)(iobase + port)); writeb(data, mmio + port);
return 0; return 0;
} }
return readb((void __iomem *)(iobase + port)); return readb(mmio + port);
} }
/* lowlevel write to eeprom/dac */ /* lowlevel write to eeprom/dac */
@ -1413,9 +1416,13 @@ int labpc_common_attach(struct comedi_device *dev,
/* 8255 dio */ /* 8255 dio */
s = &dev->subdevices[2]; s = &dev->subdevices[2];
ret = subdev_8255_init(dev, s, if (board->has_mmio) {
(board->has_mmio) ? labpc_8255_mmio : NULL, ret = subdev_8255_init(dev, s, labpc_8255_mmio,
(unsigned long)dev);
} else {
ret = subdev_8255_init(dev, s, NULL,
dev->iobase + DIO_BASE_REG); dev->iobase + DIO_BASE_REG);
}
if (ret) if (ret)
return ret; return ret;