staging: comedi: add an 'mmio' member to comedi_device

All the comedi drivers that use memory mapped io currently have a
void __iomem * member in their private data for the driver. For
some of the drivers this is actually the only member in that data.

For convienence, add a new member to the comedi_device for this
void __iomem *.

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/comedidev.h b/drivers/staging/comedi/comedidev.h
index f3999f5e809183c5163d3d25fd8221a9cd634a90..58e58a32e93db35251af80ec507565bbac7e97dd 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -253,6 +253,7 @@ struct comedi_device {
        struct comedi_subdevice *subdevices;
 
        /* dumb */
+       void __iomem *mmio;
        unsigned long iobase;
        unsigned long iolen;
        unsigned int irq;

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 42ddf1332ce89dee17a2a580c5b0d9a1858cc8a5..9ada130f2a76696ad7a3097c6c7cd005c3eff0f6 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -121,6 +121,7 @@ static void comedi_device_detach_cleanup(struct comedi_device *dev)
        dev->driver = NULL;
        dev->board_name = NULL;
        dev->board_ptr = NULL;
+       dev->mmio = NULL;
        dev->iobase = 0;
        dev->iolen = 0;
        dev->ioenabled = false;