diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-08-12 11:17:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-16 12:23:24 -0700 |
| commit | f6ce09504ddc81aec07ddfcb16ad3c5b80ab19d0 (patch) | |
| tree | 31f1be93bff618fdfa1653a183ec486690f92fbd /drivers/staging/comedi/drivers/amplc_dio200.h | |
| parent | 593d11c5a30f4049887dfad7ca2ac56a97c33c99 (diff) | |
staging: comedi: amplc_dio200.h: remove struct dio200_layout definition
This struct is used to provide part of the boardinfo data. Using the extra
indirection does not provide any additional clarity to the driver.
Absorb the members from dio200_layout into dio200_board and remove the
extra 'layout' indirection.
For aesthetics, rename all the local variables used for the boardinfo
pointer to 'board'.
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 | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.h b/drivers/staging/comedi/drivers/amplc_dio200.h index e51261b006e1..60b7ae1a6423 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.h +++ b/drivers/staging/comedi/drivers/amplc_dio200.h @@ -31,11 +31,10 @@ enum dio200_sdtype { sd_none, sd_intr, sd_8255, sd_8254, sd_timer }; #define DIO200_MAX_SUBDEVS 8 #define DIO200_MAX_ISNS 6 -/* - * Board descriptions. - */ - -struct dio200_layout { +struct dio200_board { + const char *name; + unsigned char mainbar; + unsigned char mainshift; unsigned short n_subdevs; /* number of subdevices */ unsigned char sdtype[DIO200_MAX_SUBDEVS]; /* enum dio200_sdtype */ unsigned char sdinfo[DIO200_MAX_SUBDEVS]; /* depends on sdtype */ @@ -44,13 +43,6 @@ struct dio200_layout { bool has_enhancements:1; /* has enhanced features */ }; -struct dio200_board { - const char *name; - struct dio200_layout layout; - unsigned char mainbar; - unsigned char mainshift; -}; - int amplc_dio200_common_attach(struct comedi_device *dev, unsigned int irq, unsigned long req_irq_flags); |