summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-07-29 15:01:20 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-30 16:55:14 -0700
commitd7e6dc1338eebae3b324b9a99e9d03d80c43aaef (patch)
tree168b0913511b01f6a9baf721ffc2837fa8d867e7 /drivers/staging/comedi
parentab35426810e855e5cffa8d7cebbfe8d1c53594c3 (diff)
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>
Diffstat (limited to 'drivers/staging/comedi')
-rw-r--r--drivers/staging/comedi/comedidev.h1
-rw-r--r--drivers/staging/comedi/drivers.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index f3999f5e8091..58e58a32e93d 100644
--- 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 42ddf1332ce8..9ada130f2a76 100644
--- 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;