staging: comedi: acl7225b: cleanup boardinfo

For aesthetic reasons, move the boardinfo table near the struct
definition. Remove the unnecessary comments in the struct definition.
Reformat the boardinfo in C99 format and add some whitespace to
help readability.

Rename the boardinfo struct and the boardinfo table so they have
namespace associated with the driver.

Remove the ACL7225_SIZE and P16R16DIO_SIZE defines. They are only
used in the boardinfo table and the open-coded values provide the
information more clearly.

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/acl7225b.c b/drivers/staging/comedi/drivers/acl7225b.c
index 28c7fd3a96b690b6e64dc6a5206a34063fd89d33..eb8e906929ab0db5363f8550deb1edb7b1569c70 100644 (file)
--- a/drivers/staging/comedi/drivers/acl7225b.c
+++ b/drivers/staging/comedi/drivers/acl7225b.c
@@ -15,16 +15,24 @@ Devices: [Adlink] ACL-7225b (acl7225b), [ICP] P16R16DIO (p16r16dio)
 
 #include <linux/ioport.h>
 
-#define ACL7225_SIZE   8       /* Requires 8 ioports, but only 4 are used */
-#define P16R16DIO_SIZE 4
 #define ACL7225_RIO_LO 0       /* Relays input/output low byte (R0-R7) */
 #define ACL7225_RIO_HI 1       /* Relays input/output high byte (R8-R15) */
 #define ACL7225_DI_LO  2       /* Digital input low byte (DI0-DI7) */
 #define ACL7225_DI_HI  3       /* Digital input high byte (DI8-DI15) */
 
-struct boardtype {
-       const char *name;       /*  driver name */
-       int io_range;           /*  len of I/O space */
+struct acl7225b_boardinfo {
+       const char *name;
+       int io_range;
+};
+
+static const struct acl7225b_boardinfo acl7225b_boards[] = {
+       {
+               .name           = "acl7225b",
+               .io_range       = 8,            /* only 4 are used */
+       }, {
+               .name           = "p16r16dio",
+               .io_range       = 4,
+       },
 };
 
 static int acl7225b_do_insn(struct comedi_device *dev,
@@ -59,7 +67,7 @@ static int acl7225b_di_insn(struct comedi_device *dev,
 static int acl7225b_attach(struct comedi_device *dev,
                           struct comedi_devconfig *it)
 {
-       const struct boardtype *board = comedi_board(dev);
+       const struct acl7225b_boardinfo *board = comedi_board(dev);
        struct comedi_subdevice *s;
        int iobase, iorange;
        int ret;
@@ -116,25 +124,20 @@ static int acl7225b_attach(struct comedi_device *dev,
 
 static void acl7225b_detach(struct comedi_device *dev)
 {
-       const struct boardtype *board = comedi_board(dev);
+       const struct acl7225b_boardinfo *board = comedi_board(dev);
 
        if (dev->iobase)
                release_region(dev->iobase, board->io_range);
 }
 
-static const struct boardtype boardtypes[] = {
-       { "acl7225b", ACL7225_SIZE, },
-       { "p16r16dio", P16R16DIO_SIZE, },
-};
-
 static struct comedi_driver acl7225b_driver = {
        .driver_name    = "acl7225b",
        .module         = THIS_MODULE,
        .attach         = acl7225b_attach,
        .detach         = acl7225b_detach,
-       .board_name     = &boardtypes[0].name,
-       .num_names      = ARRAY_SIZE(boardtypes),
-       .offset         = sizeof(struct boardtype),
+       .board_name     = &acl7225b_boards[0].name,
+       .num_names      = ARRAY_SIZE(acl7225b_boards),
+       .offset         = sizeof(struct acl7225b_boardinfo),
 };
 module_comedi_driver(acl7225b_driver);