- fixed '"debug" is not a good name for a global variable...' (now dvb_dibusb_debug) (thanks to Adrian Bunk)

- other globals removed

1 files changed, 14 insertions, 5 deletions

diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
index 2ac4599aa..978804947 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
@@ -27,17 +27,21 @@
 #include <linux/moduleparam.h>
 
 /* debug */
-#ifdef CONFIG_DVB_DIBCOM_DEBUG
-int debug;
+static int debug;
 module_param(debug, int, 0644);
-MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=alotmore,8=ts,16=err,32=rc (|-able)).");
+MODULE_PARM_DESC(debug, "set debugging level (1=info,2=xfer,4=alotmore,8=ts,16=err,32=rc (|-able))."
+#ifdef CONFIG_DVB_DIBCOM_DEBUG
+		" (debugging is not enabled)"
 #endif
+);
+int dvb_dibusb_debug = 0;
 
-int pid_parse;
+
+static int pid_parse;
 module_param(pid_parse, int, 0644);
 MODULE_PARM_DESC(pid_parse, "enable pid parsing (filtering) when running at USB2.0");
 
-int rc_query_interval;
+static int rc_query_interval;
 module_param(rc_query_interval, int, 0644);
 MODULE_PARM_DESC(rc_query_interval, "interval in msecs for remote control query (default: 100; min: 40)");
 
@@ -410,6 +414,11 @@ static int dibusb_probe(struct usb_interface *intf,
 		dib->udev = udev;
 		dib->dibdev = dibdev;
 
+		/* store parameters to structures */
+		dvb_dibusb_debug = debug;
+		dib->rc_query_interval = rc_query_interval;
+		dib->pid_parse = pid_parse;
+
 		usb_set_intfdata(intf, dib);
 		
 		ret = dibusb_init(dib);