[media] ene_ir: Use current logging styles

[firefly-linux-kernel-4.4.55.git] / drivers / media / rc / ene_ir.h

diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h
index 337a41d4450ba2aee45171cfc7e92117baf7e24e..fd108d90f7500b726cee6edb6fd8bb0fdce310f6 100644 (file)
--- a/drivers/media/rc/ene_ir.h
+++ b/drivers/media/rc/ene_ir.h
@@ -182,20 +182,11 @@
 #define  ENE_HW_C              2       /* 3926C */
 #define  ENE_HW_D              3       /* 3926D or later */
 
-#define ene_printk(level, text, ...) \
-       printk(level ENE_DRIVER_NAME ": " text "\n", ## __VA_ARGS__)
-
-#define ene_notice(text, ...) ene_printk(KERN_NOTICE, text, ## __VA_ARGS__)
-#define ene_warn(text, ...) ene_printk(KERN_WARNING, text, ## __VA_ARGS__)
-
-
-#define __dbg(level, format, ...) \
-       do { \
-               if (debug >= level) \
-                       printk(KERN_DEBUG ENE_DRIVER_NAME \
-                               ": " format "\n", ## __VA_ARGS__); \
-       } while (0)
-
+#define __dbg(level, format, ...)                              \
+do {                                                           \
+       if (debug >= level)                                     \
+               pr_debug(format "\n", ## __VA_ARGS__);          \
+} while (0)
 
 #define dbg(format, ...)               __dbg(1, format, ## __VA_ARGS__)
 #define dbg_verbose(format, ...)       __dbg(2, format, ## __VA_ARGS__)
@@ -235,7 +226,7 @@ struct ene_device {
        bool tx_sample_pulse;                   /* current sample is pulse */
 
        /* TX buffer */
-       int *tx_buffer;                         /* input samples buffer*/
+       unsigned *tx_buffer;                    /* input samples buffer*/
        int tx_pos;                             /* position in that bufer */
        int tx_len;                             /* current len of tx buffer */
        int tx_done;                            /* done transmitting */