Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[pandora-kernel.git] / drivers / platform / x86 / dell-laptop.c

diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index de301aa..d3841de 100644 (file)
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -11,6 +11,8 @@
  *  published by the Free Software Foundation.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -434,8 +436,7 @@ static int __init dell_setup_rfkill(void)
        int ret;
 
        if (dmi_check_system(dell_blacklist)) {
-               printk(KERN_INFO "dell-laptop: Blacklisted hardware detected - "
-                               "not enabling rfkill\n");
+               pr_info("Blacklisted hardware detected - not enabling rfkill\n");
                return 0;
        }
 
@@ -606,7 +607,7 @@ static int __init dell_init(void)
        dmi_walk(find_tokens, NULL);
 
        if (!da_tokens)  {
-               printk(KERN_INFO "dell-laptop: Unable to find dmi tokens\n");
+               pr_info("Unable to find dmi tokens\n");
                return -ENODEV;
        }
 
@@ -636,14 +637,13 @@ static int __init dell_init(void)
        ret = dell_setup_rfkill();
 
        if (ret) {
-               printk(KERN_WARNING "dell-laptop: Unable to setup rfkill\n");
+               pr_warn("Unable to setup rfkill\n");
                goto fail_rfkill;
        }
 
        ret = i8042_install_filter(dell_laptop_i8042_filter);
        if (ret) {
-               printk(KERN_WARNING
-                      "dell-laptop: Unable to install key filter\n");
+               pr_warn("Unable to install key filter\n");
                goto fail_filter;
        }