staging: comedi: cb_pcidas64: tidy up dio_callback()

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 (DIO_8255_OFFSET).

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/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index fafde70..61cb560 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -3370,15 +3370,13 @@ static int ao_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 }
 
 static int dio_callback(struct comedi_device *dev,
-                       int dir, int port, int data, unsigned long arg)
+                       int dir, int port, int data, unsigned long iobase)
 {
-       void __iomem *iobase = (void __iomem *)arg;
-
        if (dir) {
-               writeb(data, iobase + port);
+               writeb(data, dev->mmio + iobase + port);
                return 0;
        }
-       return readb(iobase + port);
+       return readb(dev->mmio + iobase + port);
 }
 
 static int dio_callback_4020(struct comedi_device *dev,
@@ -3846,9 +3844,8 @@ static int setup_subdevices(struct comedi_device *dev)
                        ret = subdev_8255_init(dev, s, dio_callback_4020,
                                               (unsigned long)dio_8255_iobase);
                } else {
-                       dio_8255_iobase = dev->mmio + DIO_8255_OFFSET;
                        ret = subdev_8255_init(dev, s, dio_callback,
-                                              (unsigned long)dio_8255_iobase);
+                                              DIO_8255_OFFSET);
                }
                if (ret)
                        return ret;