Merge branch 'akpm' (Andrew's patch-bomb)

[karo-tx-linux.git] / drivers / platform / x86 / tc1100-wmi.c

diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c
index 865ef78d6f1a7c0593758fd73777bc35a502d5b4..e24f5ae475af019815b10a07e2febaabd29135c6 100644 (file)
--- a/drivers/platform/x86/tc1100-wmi.c
+++ b/drivers/platform/x86/tc1100-wmi.c
@@ -25,6 +25,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -40,9 +42,6 @@
 #define TC1100_INSTANCE_WIRELESS               1
 #define TC1100_INSTANCE_JOGDIAL                2
 
-#define TC1100_LOGPREFIX "tc1100-wmi: "
-#define TC1100_INFO KERN_INFO TC1100_LOGPREFIX
-
 MODULE_AUTHOR("Jamey Hicks, Carlos Corbacho");
 MODULE_DESCRIPTION("HP Compaq TC1100 Tablet WMI Extras");
 MODULE_LICENSE("GPL");
@@ -264,7 +263,7 @@ static int __init tc1100_init(void)
        if (error)
                goto err_device_del;
 
-       printk(TC1100_INFO "HP Compaq TC1100 Tablet WMI Extras loaded\n");
+       pr_info("HP Compaq TC1100 Tablet WMI Extras loaded\n");
        return 0;
 
  err_device_del: