]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
staging: comedi: pcl726: convert boardinfo declaration to C99 format
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 25 Sep 2013 22:34:47 +0000 (15:34 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 26 Sep 2013 16:32:17 +0000 (09:32 -0700)
Convert the boardinfo declaration to C99 format to make it less error
prone and easier to maintain.

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>
drivers/staging/comedi/drivers/pcl726.c

index 32fb57a7fa263646c1a0f4a8f0965870ca2f416e..d1e1e5e1e99669b63248637c5af3957d3484fab9 100644 (file)
@@ -119,21 +119,67 @@ struct pcl726_board {
 };
 
 static const struct pcl726_board boardtypes[] = {
-       {"pcl726", 6, 6, 0x0000, PCL726_SIZE, 1,
-        PCL726_DI_HI, PCL726_DI_LO, PCL726_DO_HI, PCL726_DO_LO,
-        &rangelist_726[0],},
-       {"pcl727", 12, 4, 0x0000, PCL727_SIZE, 1,
-        PCL727_DI_HI, PCL727_DI_LO, PCL727_DO_HI, PCL727_DO_LO,
-        &rangelist_727[0],},
-       {"pcl728", 2, 6, 0x0000, PCL728_SIZE, 0,
-        0, 0, 0, 0,
-        &rangelist_728[0],},
-       {"acl6126", 6, 5, 0x96e8, PCL726_SIZE, 1,
-        PCL726_DI_HI, PCL726_DI_LO, PCL726_DO_HI, PCL726_DO_LO,
-        &rangelist_726[0],},
-       {"acl6128", 2, 6, 0x0000, PCL728_SIZE, 0,
-        0, 0, 0, 0,
-        &rangelist_728[0],},
+       {
+               .name           = "pcl726",
+               .n_aochan       = 6,
+               .num_of_ranges  = 6,
+               .IRQbits        = 0x0000,
+               .io_range       = PCL726_SIZE,
+               .have_dio       = 1,
+               .di_hi          = PCL726_DI_HI,
+               .di_lo          = PCL726_DI_LO,
+               .do_hi          = PCL726_DO_HI,
+               .do_lo          = PCL726_DO_LO,
+               .range_type_list = &rangelist_726[0],
+       }, {
+               .name           = "pcl727",
+               .n_aochan       = 12,
+               .num_of_ranges  = 4,
+               .IRQbits        = 0x0000,
+               .io_range       = PCL727_SIZE,
+               .have_dio       = 1,
+               .di_hi          = PCL727_DI_HI,
+               .di_lo          = PCL727_DI_LO,
+               .do_hi          = PCL727_DO_HI,
+               .do_lo          = PCL727_DO_LO,
+               .range_type_list = &rangelist_727[0],
+       }, {
+               .name           = "pcl728",
+               .n_aochan       = 2,
+               .num_of_ranges  = 6,
+               .IRQbits        = 0x0000,
+               .io_range       = PCL728_SIZE,
+               .have_dio       = 0,
+               .di_hi          = 0,
+               .di_lo          = 0,
+               .do_hi          = 0,
+               .do_lo          = 0,
+               .range_type_list = &rangelist_728[0],
+       }, {
+               .name           = "acl6126",
+               .n_aochan       = 6,
+               .num_of_ranges  = 5,
+               .IRQbits        = 0x96e8,
+               .io_range       = PCL726_SIZE,
+               .have_dio       = 1,
+               .di_hi          = PCL726_DI_HI,
+               .di_lo          = PCL726_DI_LO,
+               .do_hi          = PCL726_DO_HI,
+               .do_lo          = PCL726_DO_LO,
+               .range_type_list = &rangelist_726[0],
+       }, {
+               .name           = "acl6128",
+               .n_aochan       = 2,
+               .num_of_ranges  = 6,
+               .IRQbits        = 0x0000,
+               .io_range       = PCL728_SIZE,
+               .have_dio       = 0,
+               .di_hi          = 0,
+               .di_lo          = 0,
+               .do_hi          = 0,
+               .do_lo          = 0,
+               .range_type_list = &rangelist_728[0],
+       },
 };
 
 struct pcl726_private {