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>

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index d728fbd6d3a0e52c17b736351eb6323ec6731720..90fbb25e55ab61d99fec071b800413aedd42df4e 100644 (file)
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -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;