From 6f929b4e5a022c3ca806c1675ccb833c42086853 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Mon, 28 Jul 2014 13:09:29 +0100 Subject: [PATCH] staging: comedi: amplc_pc236: move static board data Move the static board data in `pc236_isa_boards[]` and `pc236_pci_board` closer to where they are used. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/amplc_pc236.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c index b92fc6f2850b..c96519d89179 100644 --- a/drivers/staging/comedi/drivers/amplc_pc236.c +++ b/drivers/staging/comedi/drivers/amplc_pc236.c @@ -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, -- 2.11.0