diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-29 15:01:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-30 16:55:16 -0700 |
| commit | 0c3dfdc2d9a913c227a71f8cf728a70316c3abb4 (patch) | |
| tree | 4db322561a9d3af6205f1c0ba25d2a081c04f67c /drivers/staging/comedi/drivers/amplc_dio200.h | |
| parent | d6e497b92f4296db79577a05d399ba20a58b719b (diff) | |
staging: comedi: amplc_dio200: use the comedi_device 'mmio' member
The amplc_dio200_common module currently uses a union in the private
data to determine if the hardware uses port or memory mapped I/O.
Use the new 'mmio' member in the comedi_device for the ioremap'ed
base address and remove all the union code.
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/drivers/amplc_dio200.h')
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_dio200.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.h b/drivers/staging/comedi/drivers/amplc_dio200.h index 43160b9944bb..e0afe2cee2d6 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.h +++ b/drivers/staging/comedi/drivers/amplc_dio200.h @@ -28,18 +28,6 @@ #define DIO200_PCIE_IO_SIZE 0x4000 /* - * Register region. - */ -enum dio200_regtype { no_regtype = 0, io_regtype, mmio_regtype }; -struct dio200_region { - union { - unsigned long iobase; /* I/O base address */ - unsigned char __iomem *membase; /* mapped MMIO base address */ - } u; - enum dio200_regtype regtype; -}; - -/* * Subdevice types. */ enum dio200_sdtype { sd_none, sd_intr, sd_8255, sd_8254, sd_timer }; @@ -75,7 +63,6 @@ struct dio200_board { * Comedi device private data. */ struct dio200_private { - struct dio200_region io; /* Register region */ int intr_sd; }; |