staging: comedi: das08,das08_cs: Move das08_cs_boards[]

Move `das08_cs_boards[]` from "das08.c" to "das08_cs.c" and make it
static const.  It no longer refers to anything in "das08.c" and no
longer needs to be exported.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index 78ee0be..1db86c8 100644 (file)
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -663,35 +663,6 @@ static const struct das08_board_struct das08_boards[] = {
 };
 #endif /* DO_COMEDI_DRIVER_REGISTER */
 
-#if IS_ENABLED(CONFIG_COMEDI_DAS08_CS)
-struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS] = {
-       {
-               .name = "pcm-das08",
-               .id = 0x0,              /*  XXX */
-               .bustype = pcmcia,
-               .ai_nbits = 12,
-               .ai_pg = das08_bipolar5,
-               .ai_encoding = das08_pcm_encode12,
-               .di_nchan = 3,
-               .do_nchan = 3,
-               .iosize = 16,
-       },
-       /*  duplicate so driver name can be used also */
-       {
-               .name = "das08_cs",
-               .id = 0x0,              /*  XXX */
-               .bustype = pcmcia,
-               .ai_nbits = 12,
-               .ai_pg = das08_bipolar5,
-               .ai_encoding = das08_pcm_encode12,
-               .di_nchan = 3,
-               .do_nchan = 3,
-               .iosize = 16,
-       },
-};
-EXPORT_SYMBOL_GPL(das08_cs_boards);
-#endif
-
 int das08_common_attach(struct comedi_device *dev, unsigned long iobase)
 {
        const struct das08_board_struct *thisboard = comedi_board(dev);

diff --git a/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h
index d70d319..48fa183 100644 (file)
--- a/drivers/staging/comedi/drivers/das08.h
+++ b/drivers/staging/comedi/drivers/das08.h
@@ -56,9 +56,6 @@ struct das08_private_struct {
        unsigned int i8254_iobase;
 };
 
-#define NUM_DAS08_CS_BOARDS 2
-extern struct das08_board_struct das08_cs_boards[NUM_DAS08_CS_BOARDS];
-
 int das08_common_attach(struct comedi_device *dev, unsigned long iobase);
 void das08_common_detach(struct comedi_device *dev);
 

diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c
index f5700de..e4c91e6 100644 (file)
--- a/drivers/staging/comedi/drivers/das08_cs.c
+++ b/drivers/staging/comedi/drivers/das08_cs.c
@@ -58,6 +58,32 @@ Command support does not exist, but could be added for this board.
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
 
+static const struct das08_board_struct das08_cs_boards[] = {
+       {
+               .name = "pcm-das08",
+               .id = 0x0,              /*  XXX */
+               .bustype = pcmcia,
+               .ai_nbits = 12,
+               .ai_pg = das08_bipolar5,
+               .ai_encoding = das08_pcm_encode12,
+               .di_nchan = 3,
+               .do_nchan = 3,
+               .iosize = 16,
+       },
+       /*  duplicate so driver name can be used also */
+       {
+               .name = "das08_cs",
+               .id = 0x0,              /*  XXX */
+               .bustype = pcmcia,
+               .ai_nbits = 12,
+               .ai_pg = das08_bipolar5,
+               .ai_encoding = das08_pcm_encode12,
+               .di_nchan = 3,
+               .do_nchan = 3,
+               .iosize = 16,
+       },
+};
+
 static struct pcmcia_device *cur_dev;
 
 static int das08_cs_attach(struct comedi_device *dev,