diff mbox

[2/2] dell-wmi - use pr_xxx() for printing messages

Message ID 20091227095005.14542.67746.stgit@localhost.localdomain (mailing list archive)
State RFC, archived
Headers show

Commit Message

Dmitry Torokhov Dec. 27, 2009, 9:50 a.m. UTC
None
diff mbox

Patch

diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
index e0a0716..ff67a78 100644
--- a/drivers/platform/x86/dell-wmi.c
+++ b/drivers/platform/x86/dell-wmi.c
@@ -23,6 +23,8 @@ 
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -147,8 +149,7 @@  static void dell_wmi_notify(u32 value, void *context)
 		u16 *buffer_entry = (u16 *)obj->buffer.pointer;
 
 		if (dell_new_hk_type && buffer_entry[1] != 0x10) {
-			printk(KERN_INFO
-				"dell-wmi: Received unknown WMI event (0x%x)\n",
+			pr_info("Received unknown WMI event (0x%x)\n",
 				buffer_entry[1]);
 			return;
 		}
@@ -161,8 +162,7 @@  static void dell_wmi_notify(u32 value, void *context)
 		key = sparse_keymap_entry_from_scancode(dell_wmi_input_dev,
 							reported_key);
 		if (!key) {
-			printk(KERN_INFO "dell-wmi: Unknown key %x pressed\n",
-				reported_key);
+			pr_info("Unknown key %x pressed\n", reported_key);
 		} else if ((key->keycode == KEY_BRIGHTNESSUP ||
 			    key->keycode == KEY_BRIGHTNESSDOWN) && acpi_video) {
 			/* Don't report brightness notifications that will also
@@ -268,7 +268,7 @@  static int __init dell_wmi_init(void)
 	int err;
 
 	if (!wmi_has_guid(DELL_EVENT_GUID)) {
-		printk(KERN_WARNING "dell-wmi: No known WMI GUID found\n");
+		pr_warning("No known WMI GUID found\n");
 		return -ENODEV;
 	}
 
@@ -283,9 +283,7 @@  static int __init dell_wmi_init(void)
 					 dell_wmi_notify, NULL);
 	if (err) {
 		dell_wmi_input_destroy();
-		printk(KERN_ERR
-			"dell-wmi: Unable to register notify handler - %d\n",
-			err);
+		pr_err("Unable to register notify handler - %d\n", err);
 		return err;
 	}