staging: comedi: adv_pci1710: convert boardinfo initialization to C99 format

Convert the boardinfo initialization to C99 format to make it
less error prone.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 7f27c5929999c0cf50558cdf9fd7befb9da4e314..58de0259dd4f71f84e4b95f0aad6af3dc9caa4d8 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -202,40 +202,124 @@ struct boardtype {
 };
 
 static const struct boardtype boardtypes[] = {
-       {"pci1710", 0x1710,
-        IORANGE_171x, 1, TYPE_PCI171X,
-        16, 8, 2, 16, 16, 1, 0x0fff, 0x0fff,
-        &range_pci1710_3, range_codes_pci1710_3,
-        &range_pci171x_da,
-        10000, 2048},
-       {"pci1710hg", 0x1710,
-        IORANGE_171x, 1, TYPE_PCI171X,
-        16, 8, 2, 16, 16, 1, 0x0fff, 0x0fff,
-        &range_pci1710hg, range_codes_pci1710hg,
-        &range_pci171x_da,
-        10000, 2048},
-       {"pci1711", 0x1711,
-        IORANGE_171x, 1, TYPE_PCI171X,
-        16, 0, 2, 16, 16, 1, 0x0fff, 0x0fff,
-        &range_pci17x1, range_codes_pci17x1, &range_pci171x_da,
-        10000, 512},
-       {"pci1713", 0x1713,
-        IORANGE_171x, 1, TYPE_PCI1713,
-        32, 16, 0, 0, 0, 0, 0x0fff, 0x0000,
-        &range_pci1710_3, range_codes_pci1710_3, NULL,
-        10000, 2048},
-       {"pci1720", 0x1720,
-        IORANGE_1720, 0, TYPE_PCI1720,
-        0, 0, 4, 0, 0, 0, 0x0000, 0x0fff,
-        NULL, NULL, &range_pci1720,
-        0, 0},
-       {"pci1731", 0x1731,
-        IORANGE_171x, 1, TYPE_PCI171X,
-        16, 0, 0, 16, 16, 0, 0x0fff, 0x0000,
-        &range_pci17x1, range_codes_pci17x1, NULL,
-        10000, 512},
-       /*  dummy entry corresponding to driver name */
-       {.name = DRV_NAME},
+       {
+               .name           = "pci1710",
+               .device_id      = 0x1710,
+               .iorange        = IORANGE_171x,
+               .have_irq       = 1,
+               .cardtype       = TYPE_PCI171X,
+               .n_aichan       = 16,
+               .n_aichand      = 8,
+               .n_aochan       = 2,
+               .n_dichan       = 16,
+               .n_dochan       = 16,
+               .n_counter      = 1,
+               .ai_maxdata     = 0x0fff,
+               .ao_maxdata     = 0x0fff,
+               .rangelist_ai   = &range_pci1710_3,
+               .rangecode_ai   = range_codes_pci1710_3,
+               .rangelist_ao   = &range_pci171x_da,
+               .ai_ns_min      = 10000,
+               .fifo_half_size = 2048,
+       }, {
+               .name           = "pci1710hg",
+               .device_id      = 0x1710,
+               .iorange        = IORANGE_171x,
+               .have_irq       = 1,
+               .cardtype       = TYPE_PCI171X,
+               .n_aichan       = 16,
+               .n_aichand      = 8,
+               .n_aochan       = 2,
+               .n_dichan       = 16,
+               .n_dochan       = 16,
+               .n_counter      = 1,
+               .ai_maxdata     = 0x0fff,
+               .ao_maxdata     = 0x0fff,
+               .rangelist_ai   = &range_pci1710hg,
+               .rangecode_ai   = range_codes_pci1710hg,
+               .rangelist_ao   = &range_pci171x_da,
+               .ai_ns_min      = 10000,
+               .fifo_half_size = 2048,
+       }, {
+               .name           = "pci1711",
+               .device_id      = 0x1711,
+               .iorange        = IORANGE_171x,
+               .have_irq       = 1,
+               .cardtype       = TYPE_PCI171X,
+               .n_aichan       = 16,
+               .n_aichand      = 0,
+               .n_aochan       = 2,
+               .n_dichan       = 16,
+               .n_dochan       = 16,
+               .n_counter      = 1,
+               .ai_maxdata     = 0x0fff,
+               .ao_maxdata     = 0x0fff,
+               .rangelist_ai   = &range_pci17x1,
+               .rangecode_ai   = range_codes_pci17x1,
+               .rangelist_ao   = &range_pci171x_da,
+               .ai_ns_min      = 10000,
+               .fifo_half_size = 512,
+       }, {
+               .name           = "pci1713",
+               .device_id      = 0x1713,
+               .iorange        = IORANGE_171x,
+               .have_irq       = 1,
+               .cardtype       = TYPE_PCI1713,
+               .n_aichan       = 32,
+               .n_aichand      = 16,
+               .n_aochan       = 0,
+               .n_dichan       = 0,
+               .n_dochan       = 0,
+               .n_counter      = 0,
+               .ai_maxdata     = 0x0fff,
+               .ao_maxdata     = 0x0000,
+               .rangelist_ai   = &range_pci1710_3,
+               .rangecode_ai   = range_codes_pci1710_3,
+               .rangelist_ao   = NULL,
+               .ai_ns_min      = 10000,
+               .fifo_half_size = 2048,
+       }, {
+               .name           = "pci1720",
+               .device_id      = 0x1720,
+               .iorange        = IORANGE_1720,
+               .have_irq       = 0,
+               .cardtype       = TYPE_PCI1720,
+               .n_aichan       = 0,
+               .n_aichand      = 0,
+               .n_aochan       = 4,
+               .n_dichan       = 0,
+               .n_dochan       = 0,
+               .n_counter      = 0,
+               .ai_maxdata     = 0x0000,
+               .ao_maxdata     = 0x0fff,
+               .rangelist_ai   = NULL,
+               .rangecode_ai   = NULL,
+               .rangelist_ao   = &range_pci1720,
+               .ai_ns_min      = 0,
+               .fifo_half_size = 0,
+       }, {
+               .name           = "pci1731",
+               .device_id      = 0x1731,
+               .iorange        = IORANGE_171x,
+               .have_irq       = 1,
+               .cardtype       = TYPE_PCI171X,
+               .n_aichan       = 16,
+               .n_aichand      = 0,
+               .n_aochan       = 0,
+               .n_dichan       = 16,
+               .n_dochan       = 16,
+               .n_counter      = 0,
+               .ai_maxdata     = 0x0fff,
+               .ao_maxdata     = 0x0000,
+               .rangelist_ai   = &range_pci17x1,
+               .rangecode_ai   = range_codes_pci17x1,
+               .rangelist_ao   = NULL,
+               .ai_ns_min      = 10000,
+               .fifo_half_size = 512,
+       }, {
+               /* dummy entry corresponding to driver name */
+               .name           = DRV_NAME,
+       },
 };
 
 struct pci1710_private {