diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-23 12:57:38 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-13 14:32:30 -0700 |
| commit | 63d6ba20bab01ea1a92b3fe7718416a8527e009a (patch) | |
| tree | 6715afef0fba17f5acbd41180ee4ea831442bf03 /drivers/staging/comedi/drivers/ni_labpc_pci.c | |
| parent | 9548b735df211550f390d9dcecf9ea0bfc8a585e (diff) | |
staging: comedi: ni_labpc: cleanup true/false flags in boardinfo
The 'register_layout' in the boardinfo can be represented as
a true/false flag instead of an enum. Rename the variable to
'is_labpc1200' and change it to an unsigned 1-bit bit-field.
The 'has_ao' variable is also a true/false flag. Change it to
an unsigned 1-bit bit-field.
Reorder the boardinfo data so that the bit-field data is grouped
together.
For aesthetic reasons, and move the 'const' variables then
reorder the boardinfo declarations to match the definition.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_labpc_pci.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_labpc_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc_pci.c b/drivers/staging/comedi/drivers/ni_labpc_pci.c index 8e916f86ccea..b993b69459ae 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_pci.c +++ b/drivers/staging/comedi/drivers/ni_labpc_pci.c @@ -49,12 +49,12 @@ enum labpc_pci_boardid { static const struct labpc_boardinfo labpc_pci_boards[] = { [BOARD_NI_PCI1200] = { .name = "ni_pci-1200", - .ai_speed = 10000, - .register_layout = labpc_1200_layout, - .has_ao = 1, .ai_range_table = &range_labpc_1200_ai, .ai_range_code = labpc_1200_ai_gain_bits, + .ai_speed = 10000, .ai_scan_up = 1, + .has_ao = 1, + .is_labpc1200 = 1, .has_mmio = 1, }, }; |