hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: daqboard2000: tidy up daqboard2000_8255_cb() 

The 8255 driver (*io) callback now includes the comedi_device pointer.
Using this we can get the ioremap'ed base address.

Instead of passing the (cast) mmio address to subdev_8255_init(), pass
the 'iobase' of the 8255 registers (dioP2ExpansionIO8Bit).

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

10
drivers/staging/comedi/drivers/daqboard2000.c
View File

@ -653,15 +653,13 @@ static void daqboard2000_initializeDac(struct comedi_device *dev)
static int daqboard2000_8255_cb(struct comedi_device *dev,
int dir, int port, int data,
unsigned long ioaddr)
unsigned long iobase)
{
void __iomem *mmio_base = (void __iomem *)ioaddr;
if (dir) {
writew(data, mmio_base + port * 2);
writew(data, dev->mmio + iobase + port * 2);
return 0;
}
return readw(mmio_base + port * 2);
return readw(dev->mmio + iobase + port * 2);
}
static const void *daqboard2000_find_boardinfo(struct comedi_device *dev,
@ -745,7 +743,7 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
s = &dev->subdevices[2];
result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
(unsigned long)(dev->mmio + dioP2ExpansionIO8Bit));
dioP2ExpansionIO8Bit);
if (result)
return result;