Merge remote-tracking branch 'y2038/y2038'

[karo-tx-linux.git] / drivers / staging / media / lirc / lirc_serial.c

diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 35b4ce37691ebd6a4add498642bbc7f8ee598e2e..b798b311d32ccbe47129e0b6626aa23ae73dade4 100644 (file)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -109,17 +109,9 @@ static bool iommap;
 static int ioshift;
 static bool softcarrier = true;
 static bool share_irq;
-static bool debug;
 static int sense = -1; /* -1 = auto, 0 = active high, 1 = active low */
 static bool txsense;   /* 0 = active high, 1 = active low */
 
-#define dprintk(fmt, args...)                                  \
-       do {                                                    \
-               if (debug)                                      \
-                       printk(KERN_DEBUG LIRC_DRIVER_NAME ": " \
-                              fmt, ## args);                   \
-       } while (0)
-
 /* forward declarations */
 static long send_pulse_irdeo(unsigned long length);
 static long send_pulse_homebrew(unsigned long length);
@@ -352,10 +344,9 @@ static int init_timing_params(unsigned int new_duty_cycle,
        /* Derive pulse and space from the period */
        pulse_width = period * duty_cycle / 100;
        space_width = period - pulse_width;
-       dprintk("in init_timing_params, freq=%d, duty_cycle=%d, "
-               "clk/jiffy=%ld, pulse=%ld, space=%ld\n",
-               freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
-               pulse_width, space_width);
+       pr_debug("in init_timing_params, freq=%d, duty_cycle=%d, clk/jiffy=%ld, pulse=%ld, space=%ld, conv_us_to_clocks=%ld\n",
+                freq, duty_cycle, __this_cpu_read(cpu_info.loops_per_jiffy),
+                pulse_width, space_width, conv_us_to_clocks);
        return 0;
 }
 #else /* ! USE_RDTSC */
@@ -377,8 +368,8 @@ static int init_timing_params(unsigned int new_duty_cycle,
        period = 256 * 1000000L / freq;
        pulse_width = period * duty_cycle / 100;
        space_width = period - pulse_width;
-       dprintk("in init_timing_params, freq=%d pulse=%ld, space=%ld\n",
-               freq, pulse_width, space_width);
+       pr_debug("in init_timing_params, freq=%d pulse=%ld, space=%ld\n",
+                freq, pulse_width, space_width);
        return 0;
 }
 #endif /* USE_RDTSC */
@@ -500,7 +491,7 @@ static void rbwrite(int l)
 {
        if (lirc_buffer_full(&rbuf)) {
                /* no new signals will be accepted */
-               dprintk("Buffer overrun\n");
+               pr_debug("Buffer overrun\n");
                return;
        }
        lirc_buffer_write(&rbuf, (void *)&l);
@@ -774,7 +765,7 @@ static int lirc_serial_probe(struct platform_device *dev)
                dev_info(&dev->dev, "Manually using active %s receiver\n",
                         sense ? "low" : "high");
 
-       dprintk("Interrupt %d, port %04x obtained\n", irq, io);
+       dev_dbg(&dev->dev, "Interrupt %d, port %04x obtained\n", irq, io);
        return 0;
 }
 
@@ -879,7 +870,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
                return -ENOIOCTLCMD;
 
        case LIRC_SET_SEND_DUTY_CYCLE:
-               dprintk("SET_SEND_DUTY_CYCLE\n");
+               pr_debug("SET_SEND_DUTY_CYCLE\n");
                if (!(hardware[type].features&LIRC_CAN_SET_SEND_DUTY_CYCLE))
                        return -ENOIOCTLCMD;
 
@@ -891,7 +882,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
                return init_timing_params(value, freq);
 
        case LIRC_SET_SEND_CARRIER:
-               dprintk("SET_SEND_CARRIER\n");
+               pr_debug("SET_SEND_CARRIER\n");
                if (!(hardware[type].features&LIRC_CAN_SET_SEND_CARRIER))
                        return -ENOIOCTLCMD;
 
@@ -1086,7 +1077,7 @@ static void __exit lirc_serial_exit_module(void)
 {
        lirc_unregister_driver(driver.minor);
        lirc_serial_exit();
-       dprintk("cleaned up module\n");
+       pr_debug("cleaned up module\n");
 }
 
 
@@ -1137,6 +1128,3 @@ MODULE_PARM_DESC(txsense, "Sense of transmitter circuit"
 
 module_param(softcarrier, bool, S_IRUGO);
 MODULE_PARM_DESC(softcarrier, "Software carrier (0 = off, 1 = on, default on)");
-
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Enable debugging messages");