Revert "[media] siano: apply debug flag to module level"

This reverts commit ea37094. As reported by Stephen Rothwell: After merging the v4l-dvb tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "sms_dbg" [drivers/media/dvb/siano/smsusb.ko] undefined! ERROR: "sms_dbg" [drivers/media/dvb/siano/smsdvb.ko] undefined! Caused by commit ea37094 ("[media] siano: apply debug flag to module level"). Relevant config: CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_USB_DRV=m CONFIG_SMS_SDIO_DRV=m Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
git-mirror · Sep 26, 2011 · 9e83b3e · 9e83b3e
1 parent 0f910bf
commit 9e83b3e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c
@@ -20,6 +20,10 @@
 #include "sms-cards.h"
 #include "smsir.h"
 
+static int sms_dbg;
+module_param_named(cards_dbg, sms_dbg, int, 0644);
+MODULE_PARM_DESC(cards_dbg, "set debug level (info=1, adv=2 (or-able))");
+
 static struct sms_board sms_boards[] = {
 	[SMS_BOARD_UNKNOWN] = {
 		.name	= "Unknown board",

diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
@@ -39,7 +39,7 @@
 #include "smsir.h"
 #include "smsendian.h"
 
-int sms_dbg;
+static int sms_dbg;
 module_param_named(debug, sms_dbg, int, 0644);
 MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
 

diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
@@ -751,7 +751,6 @@ int smscore_led_state(struct smscore_device_t *core, int led);
 
 
 /* ------------------------------------------------------------------------ */
-extern int sms_dbg;
 
 #define DBG_INFO 1
 #define DBG_ADV  2

diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
@@ -60,6 +60,10 @@ struct smsdvb_client_t {
 static struct list_head g_smsdvb_clients;
 static struct mutex g_smsdvb_clientslock;
 
+static int sms_dbg;
+module_param_named(debug, sms_dbg, int, 0644);
+MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
+
 /* Events that may come from DVB v3 adapter */
 static void sms_board_dvb3_event(struct smsdvb_client_t *client,
 		enum SMS_DVB3_EVENTS event) {

diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
@@ -29,6 +29,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sms-cards.h"
 #include "smsendian.h"
 
+static int sms_dbg;
+module_param_named(debug, sms_dbg, int, 0644);
+MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
+
 #define USB1_BUFFER_SIZE		0x1000
 #define USB2_BUFFER_SIZE		0x4000