V4L/DVB: tm6000: move dvb into a separate kern module

move dvb into a separate kern module

[mchehab@redhat.com: Fix several compilation breakages]

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/tm6000/Kconfig b/drivers/staging/tm6000/Kconfig
index 3657e33e88178694daf970d930f77a17e0b193ad..c725356cc3466ec5963290415765aab5fb50188a 100644 (file)
--- a/drivers/staging/tm6000/Kconfig
+++ b/drivers/staging/tm6000/Kconfig
@@ -26,8 +26,8 @@ config VIDEO_TM6000_ALSA
          module will be called tm6000-alsa.
 
 config VIDEO_TM6000_DVB
-       bool "DVB Support for tm6000 based TV cards"
-       depends on VIDEO_TM6000 && DVB_CORE && EXPERIMENTAL
+       tristate "DVB Support for tm6000 based TV cards"
+       depends on VIDEO_TM6000 && DVB_CORE && USB && EXPERIMENTAL
        select DVB_ZL10353
        ---help---
          This adds support for DVB cards based on the tm5600/tm6000 chip.

diff --git a/drivers/staging/tm6000/Makefile b/drivers/staging/tm6000/Makefile
index 93370fccc073b83540eb3998f20456803f2569b7..4129c185da5310edfef041942ccaaa54f6644160 100644 (file)
--- a/drivers/staging/tm6000/Makefile
+++ b/drivers/staging/tm6000/Makefile
@@ -4,12 +4,9 @@ tm6000-objs := tm6000-cards.o \
                   tm6000-video.o \
                   tm6000-stds.o
 
-ifeq ($(CONFIG_VIDEO_TM6000_DVB),y)
-tm6000-objs += tm6000-dvb.o
-endif
-
 obj-$(CONFIG_VIDEO_TM6000) += tm6000.o
 obj-$(CONFIG_VIDEO_TM6000_ALSA) += tm6000-alsa.o
+obj-$(CONFIG_VIDEO_TM6000_DVB) += tm6000-dvb.o
 
 EXTRA_CFLAGS = -Idrivers/media/video
 EXTRA_CFLAGS += -Idrivers/media/common/tuners

diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 6a9ae40c7c6dac2a2b60c5afa06e05ab2f928986..52e086a38b9b685431f6cdce143c0c5bdb4072df 100644 (file)
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -347,7 +347,7 @@ int tm6000_xc5000_callback(void *ptr, int component, int command, int arg)
        }
        return (rc);
 }
-
+EXPORT_SYMBOL_GPL(tm6000_xc5000_callback);
 
 /* Tuner callback to provide the proper gpio changes needed for xc2028 */
 
@@ -424,6 +424,7 @@ int tm6000_tuner_callback(void *ptr, int component, int command, int arg)
        }
        return rc;
 }
+EXPORT_SYMBOL_GPL(tm6000_tuner_callback);
 
 int tm6000_cards_setup(struct tm6000_core *dev)
 {
@@ -681,31 +682,11 @@ static int tm6000_init_dev(struct tm6000_core *dev)
                goto err;
 
        tm6000_add_into_devlist(dev);
-
        tm6000_init_extension(dev);
 
-       if (dev->caps.has_dvb) {
-               dev->dvb = kzalloc(sizeof(*(dev->dvb)), GFP_KERNEL);
-               if (!dev->dvb) {
-                       rc = -ENOMEM;
-                       goto err2;
-               }
-
-#ifdef CONFIG_VIDEO_TM6000_DVB
-               rc = tm6000_dvb_register(dev);
-               if (rc < 0) {
-                       kfree(dev->dvb);
-                       dev->dvb = NULL;
-                       goto err2;
-               }
-#endif
-       }
        mutex_unlock(&dev->lock);
        return 0;
 
-err2:
-       v4l2_device_unregister(&dev->v4l2_dev);
-
 err:
        mutex_unlock(&dev->lock);
        return rc;
@@ -906,13 +887,6 @@ static void tm6000_usb_disconnect(struct usb_interface *interface)
 
        mutex_lock(&dev->lock);
 
-#ifdef CONFIG_VIDEO_TM6000_DVB
-       if (dev->dvb) {
-               tm6000_dvb_unregister(dev);
-               kfree(dev->dvb);
-       }
-#endif
-
        if (dev->gpio.power_led) {
                switch (dev->model) {
                case TM6010_BOARD_HAUPPAUGE_900H:
@@ -942,8 +916,8 @@ static void tm6000_usb_disconnect(struct usb_interface *interface)
 
        usb_put_dev(dev->udev);
 
-       tm6000_remove_from_devlist(dev);
        tm6000_close_extension(dev);
+       tm6000_remove_from_devlist(dev);
 
        mutex_unlock(&dev->lock);
        kfree(dev);

diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c
index c3690e3580da05a002ab272a042804dfda78886f..90e745802a361215161063a16c6de543f7f6b2a9 100644 (file)
--- a/drivers/staging/tm6000/tm6000-core.c
+++ b/drivers/staging/tm6000/tm6000-core.c
@@ -407,6 +407,7 @@ int tm6000_init_digital_mode (struct tm6000_core *dev)
 
        return 0;
 }
+EXPORT_SYMBOL(tm6000_init_digital_mode);
 
 struct reg_init {
        u8 req;

diff --git a/drivers/staging/tm6000/tm6000-dvb.c b/drivers/staging/tm6000/tm6000-dvb.c
index 86c1c8b5f25aad41cc1bd82f7f62959493147538..648ab3cfa90a2ae16c6c0a2f5c2c92d0e2b721d8 100644 (file)
--- a/drivers/staging/tm6000/tm6000-dvb.c
+++ b/drivers/staging/tm6000/tm6000-dvb.c
@@ -31,6 +31,19 @@
 #include "tuner-xc2028.h"
 #include "xc5000.h"
 
+MODULE_DESCRIPTION("DVB driver extension module for tm5600/6000/6010 based TV cards");
+MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
+MODULE_LICENSE("GPL");
+
+MODULE_SUPPORTED_DEVICE("{{Trident, tm5600},"
+                       "{{Trident, tm6000},"
+                       "{{Trident, tm6010}");
+
+static int debug;
+
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, "enable debug message");
+
 static void inline print_err_status (struct tm6000_core *dev,
                                     int packet, int status)
 {
@@ -238,7 +251,7 @@ int tm6000_dvb_attach_frontend(struct tm6000_core *dev)
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-int tm6000_dvb_register(struct tm6000_core *dev)
+int register_dvb(struct tm6000_core *dev)
 {
        int ret = -1;
        struct tm6000_dvb *dvb = dev->dvb;
@@ -351,7 +364,7 @@ err:
        return ret;
 }
 
-void tm6000_dvb_unregister(struct tm6000_core *dev)
+void unregister_dvb(struct tm6000_core *dev)
 {
        struct tm6000_dvb *dvb = dev->dvb;
 
@@ -377,3 +390,69 @@ void tm6000_dvb_unregister(struct tm6000_core *dev)
 /*     mutex_unlock(&tm6000_driver.open_close_mutex); */
 
 }
+
+static int dvb_init(struct tm6000_core *dev)
+{
+       struct tm6000_dvb *dvb;
+       int rc;
+
+       if (!dev)
+               return 0;
+
+       if (!dev->caps.has_dvb)
+               return 0;
+
+       dvb = kzalloc(sizeof(struct tm6000_dvb), GFP_KERNEL);
+       if (!dvb) {
+               printk(KERN_INFO "Cannot allocate memory\n");
+               return -ENOMEM;
+       }
+
+       dev->dvb = dvb;
+
+       rc = register_dvb(dev);
+       if (rc < 0) {
+               kfree(dvb);
+               dev->dvb = NULL;
+               return 0;
+       }
+
+       return 0;
+}
+
+static int dvb_fini(struct tm6000_core *dev)
+{
+       if (!dev)
+               return 0;
+
+       if (!dev->caps.has_dvb)
+               return 0;
+
+       if (dev->dvb) {
+               unregister_dvb(dev);
+               kfree(dev->dvb);
+               dev->dvb = NULL;
+       }
+
+       return 0;
+}
+
+static struct tm6000_ops dvb_ops = {
+       .id     = TM6000_DVB,
+       .name   = "TM6000 dvb Extension",
+       .init   = dvb_init,
+       .fini   = dvb_fini,
+};
+
+static int __init tm6000_dvb_register(void)
+{
+       return tm6000_register_extension(&dvb_ops);
+}
+
+static void __exit tm6000_dvb_unregister(void)
+{
+       tm6000_unregister_extension(&dvb_ops);
+}
+
+module_init(tm6000_dvb_register);
+module_exit(tm6000_dvb_unregister);

diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index e2675cac7516d069380be164eb1aa953996e9aaa..50bb1be8484062b0d578a1bfc4eef16aff7b8838 100644 (file)
--- a/drivers/staging/tm6000/tm6000.h
+++ b/drivers/staging/tm6000/tm6000.h
@@ -223,6 +223,7 @@ struct tm6000_core {
 };
 
 #define TM6000_AUDIO 0x10
+#define TM6000_DVB     0x20
 
 struct tm6000_ops {
        struct list_head        next;
@@ -269,9 +270,6 @@ int tm6000_init_analog_mode (struct tm6000_core *dev);
 int tm6000_init_digital_mode (struct tm6000_core *dev);
 int tm6000_set_audio_bitrate (struct tm6000_core *dev, int bitrate);
 
-int tm6000_dvb_register(struct tm6000_core *dev);
-void tm6000_dvb_unregister(struct tm6000_core *dev);
-
 int tm6000_v4l2_register(struct tm6000_core *dev);
 int tm6000_v4l2_unregister(struct tm6000_core *dev);
 int tm6000_v4l2_exit(void);