staging: comedi: split out PCMCIA support into new module

Setting the `CONFIG_COMEDI_PCMCIA_DRIVERS` kernel configuration option
makes the main "comedi" module depend on the "pcmcia" module, but many
machines don't have PCMCIA slots and only a few low-level Comedi drivers
need PCMCIA support.  The Comedi PCMCIA support functions are all in
"comedi_pcmcia.c".  Turn it into a separate module so we don't have to
pull in the other PCMCIA support modules unnecessarily.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/Kconfig b/drivers/staging/comedi/Kconfig
index b2d68ecb5e24f05474064748da478a133d675608..862b18fa2de4d2d5d4a06b897276e9baf2de555d 100644 (file)
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
@@ -1076,11 +1076,14 @@ config COMEDI_NI_TIOCMD
 endif # COMEDI_PCI_DRIVERS
 
 menuconfig COMEDI_PCMCIA_DRIVERS
-       bool "Comedi PCMCIA drivers"
+       tristate "Comedi PCMCIA drivers"
        depends on PCMCIA
        ---help---
          Enable support for comedi PCMCIA drivers.
 
+         To compile this support as a module, choose M here: the module will
+         be called comedi_pcmcia.
+
 if COMEDI_PCMCIA_DRIVERS
 
 config COMEDI_CB_DAS16_CS

diff --git a/drivers/staging/comedi/Makefile b/drivers/staging/comedi/Makefile
index fae2d9090006848d4f89913ee62a2ea58e19f3ca..cfb121a5297858f79436b6c117d9c5619ae63bb6 100644 (file)
--- a/drivers/staging/comedi/Makefile
+++ b/drivers/staging/comedi/Makefile
@@ -3,11 +3,12 @@ ccflags-$(CONFIG_COMEDI_DEBUG)                := -DDEBUG
 comedi-y                               := comedi_fops.o range.o drivers.o \
                                           comedi_buf.o
 comedi-$(CONFIG_COMEDI_PCI_DRIVERS)    += comedi_pci.o
-comedi-$(CONFIG_COMEDI_PCMCIA_DRIVERS) += comedi_pcmcia.o
 comedi-$(CONFIG_COMEDI_USB_DRIVERS)    += comedi_usb.o
 comedi-$(CONFIG_PROC_FS)               += proc.o
 comedi-$(CONFIG_COMPAT)                        += comedi_compat32.o
 
+obj-$(CONFIG_COMEDI_PCMCIA_DRIVERS)    += comedi_pcmcia.o
+
 obj-$(CONFIG_COMEDI)                   += comedi.o
 
 obj-$(CONFIG_COMEDI)                   += kcomedilib/

diff --git a/drivers/staging/comedi/comedi_pcmcia.c b/drivers/staging/comedi/comedi_pcmcia.c
index 9d49d5d01ad979a628b68de81712916cddcafe16..0529bae8e5acbb886c7d7df04a3ef9a5594d4160 100644 (file)
--- a/drivers/staging/comedi/comedi_pcmcia.c
+++ b/drivers/staging/comedi/comedi_pcmcia.c
@@ -16,6 +16,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 
 #include <pcmcia/cistpl.h>
@@ -154,3 +155,18 @@ void comedi_pcmcia_driver_unregister(struct comedi_driver *comedi_driver,
        comedi_driver_unregister(comedi_driver);
 }
 EXPORT_SYMBOL_GPL(comedi_pcmcia_driver_unregister);
+
+static int __init comedi_pcmcia_init(void)
+{
+       return 0;
+}
+module_init(comedi_pcmcia_init);
+
+static void __exit comedi_pcmcia_exit(void)
+{
+}
+module_exit(comedi_pcmcia_exit);
+
+MODULE_AUTHOR("http://www.comedi.org");
+MODULE_DESCRIPTION("Comedi PCMCIA interface module");
+MODULE_LICENSE("GPL");