V4L/DVB (13531): ir-common: rename the debug routine to allow exporting it

As newer IR common code will be added on other files, we need a global
debug var inside the module.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 14 insertions, 13 deletions

diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
index fc2d8941459f..b111a0d9409b 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/common/ir-functions.c
@@ -34,11 +34,8 @@ static int repeat = 1;
 module_param(repeat, int, 0444);
 MODULE_PARM_DESC(repeat,"auto-repeat for IR keys (default: on)");
 
-static int debug;    /* debug level (0,1,2) */
-module_param(debug, int, 0644);
-
-#define dprintk(level, fmt, arg...)     if (debug >= level) \
-        printk(KERN_DEBUG fmt , ## arg)
+int media_ir_debug;    /* media_ir_debug level (0,1,2) */
+module_param_named(debug, media_ir_debug, int, 0644);
 
 /* -------------------------------------------------------------------------- */
 
@@ -49,7 +46,7 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
                        dev->name,ir->ir_key,ir->ir_raw,ir->keypressed);
                 return;
         }
-        dprintk(1,"%s: key event code=%d down=%d\n",
+        IR_dprintk(1,"%s: key event code=%d down=%d\n",
                 dev->name,ir->keycode,ir->keypressed);
         input_report_key(dev,ir->keycode,ir->keypressed);
         input_sync(dev);
@@ -295,11 +292,11 @@ u32 ir_rc5_decode(unsigned int code)
                         rc5 |= 1;
                         break;
                 case 3:
-                        dprintk(1, "ir-common: ir_rc5_decode(%x) bad code\n", org_code);
+                        IR_dprintk(1, "ir-common: ir_rc5_decode(%x) bad code\n", org_code);
                         return 0;
                 }
         }
-        dprintk(1, "ir-common: code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
+        IR_dprintk(1, "ir-common: code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
                 "instr=%x\n", rc5, org_code, RC5_START(rc5),
                 RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
         return rc5;
@@ -331,20 +328,20 @@ void ir_rc5_timer_end(unsigned long data)
 
         /* Allow some timer jitter (RC5 is ~24ms anyway so this is ok) */
         if (gap < 28000) {
-                dprintk(1, "ir-common: spurious timer_end\n");
+                IR_dprintk(1, "ir-common: spurious timer_end\n");
                 return;
         }
 
         if (ir->last_bit < 20) {
                 /* ignore spurious codes (caused by light/other remotes) */
-                dprintk(1, "ir-common: short code: %x\n", ir->code);
+                IR_dprintk(1, "ir-common: short code: %x\n", ir->code);
         } else {
                 ir->code = (ir->code << ir->shift_by) | 1;
                 rc5 = ir_rc5_decode(ir->code);
 
                 /* two start bits? */
                 if (RC5_START(rc5) != ir->start) {
-                        dprintk(1, "ir-common: rc5 start bits invalid: %u\n", RC5_START(rc5));
+                        IR_dprintk(1, "ir-common: rc5 start bits invalid: %u\n", RC5_START(rc5));
 
                         /* right address? */
                 } else if (RC5_ADDR(rc5) == ir->addr) {
@@ -354,7 +351,7 @@ void ir_rc5_timer_end(unsigned long data)
                         /* Good code, decide if repeat/repress */
                         if (toggle != RC5_TOGGLE(ir->last_rc5) ||
                             instr != RC5_INSTR(ir->last_rc5)) {
-                                dprintk(1, "ir-common: instruction %x, toggle %x\n", instr,
+                                IR_dprintk(1, "ir-common: instruction %x, toggle %x\n", instr,
                                         toggle);
                                 ir_input_nokey(ir->dev, &ir->ir);
                                 ir_input_keydown(ir->dev, &ir->ir, instr,
@@ -377,7 +374,7 @@ void ir_rc5_timer_keyup(unsigned long data)
 {
         struct card_ir *ir = (struct card_ir *)data;
 
-        dprintk(1, "ir-common: key released\n");
+        IR_dprintk(1, "ir-common: key released\n");
         ir_input_nokey(ir->dev, &ir->ir);
 }
 EXPORT_SYMBOL_GPL(ir_rc5_timer_keyup);
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 5921776929e7..5964145d65e6 100644
--- a/include/media/ir-common.h
+++ b/include/media/ir-common.h
@@ -27,6 +27,10 @@
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
 
+extern int media_ir_debug;    /* media_ir_debug level (0,1,2) */
+#define IR_dprintk(level, fmt, arg...)  if (media_ir_debug >= level) \
+        printk(KERN_DEBUG fmt , ## arg)
+
 #define IR_TYPE_RC5     1
 #define IR_TYPE_PD      2 /* Pulse distance encoded IR */
 #define IR_TYPE_OTHER  99