Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / input / apm-power.c

diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c
index 7d61a9660806c5a3d30e062ec04dc7344dedc6aa..e90ee3d306132aa91348485110ee8ac3fd119665 100644 (file)
--- a/drivers/input/apm-power.c
+++ b/drivers/input/apm-power.c
@@ -9,6 +9,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/input.h>
 #include <linux/slab.h>
@@ -23,8 +25,7 @@ static void system_power_event(unsigned int keycode)
        switch (keycode) {
        case KEY_SUSPEND:
                apm_queue_event(APM_USER_SUSPEND);
-
-               printk(KERN_INFO "apm-power: Requesting system suspend...\n");
+               pr_info("Requesting system suspend...\n");
                break;
        default:
                break;
@@ -65,18 +66,15 @@ static int apmpower_connect(struct input_handler *handler,
 
        error = input_register_handle(handle);
        if (error) {
-               printk(KERN_ERR
-                       "apm-power: Failed to register input power handler, "
-                       "error %d\n", error);
+               pr_err("Failed to register input power handler, error %d\n",
+                      error);
                kfree(handle);
                return error;
        }
 
        error = input_open_device(handle);
        if (error) {
-               printk(KERN_ERR
-                       "apm-power: Failed to open input power device, "
-                       "error %d\n", error);
+               pr_err("Failed to open input power device, error %d\n", error);
                input_unregister_handle(handle);
                kfree(handle);
                return error;