OSDN Git Service

staging: comedi: amplc_pc236: move static board data
authorIan Abbott <abbotti@mev.co.uk>
Mon, 28 Jul 2014 12:09:29 +0000 (13:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Jul 2014 23:48:42 +0000 (16:48 -0700)
Move the static board data in `pc236_isa_boards[]` and `pc236_pci_board`
closer to where they are used.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/amplc_pc236.c

index b92fc6f..c96519d 100644 (file)
@@ -84,18 +84,6 @@ struct pc236_board {
        enum pc236_bustype bustype;
 };
 
-static const struct pc236_board pc236_isa_boards[] = {
-       {
-               .name = "pc36at",
-               .bustype = isa_bustype,
-       },
-};
-
-static const struct pc236_board pc236_pci_board = {
-       .name = "pci236",
-       .bustype = pci_bustype,
-};
-
 struct pc236_private {
        unsigned long lcr_iobase; /* PLX PCI9052 config registers in PCIBAR1 */
        int enable_irq;
@@ -342,6 +330,11 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        return pc236_common_attach(dev, dev->iobase, it->options[1], 0);
 }
 
+static const struct pc236_board pc236_pci_board = {
+       .name = "pci236",
+       .bustype = pci_bustype,
+};
+
 static int pc236_auto_attach(struct comedi_device *dev,
                                       unsigned long context_unused)
 {
@@ -387,6 +380,13 @@ static void pc236_detach(struct comedi_device *dev)
        }
 }
 
+static const struct pc236_board pc236_isa_boards[] = {
+       {
+               .name = "pc36at",
+               .bustype = isa_bustype,
+       },
+};
+
 static struct comedi_driver amplc_pc236_driver = {
        .driver_name = "amplc_pc236",
        .module = THIS_MODULE,