Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...

[firefly-linux-kernel-4.4.55.git] / drivers / input / xen-kbdfront.c

diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c
index e0c024db2ca52ca99dde6e08b2ae6d641a42b9ce..7f85a862ad1160b1d1b990d867a6e77f32a1da46 100644 (file)
--- a/drivers/input/xen-kbdfront.c
+++ b/drivers/input/xen-kbdfront.c
@@ -17,6 +17,8 @@
  * Switch to grant tables together with xen-fbfront.c.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/module.h>
@@ -84,9 +86,8 @@ static irqreturn_t input_handler(int rq, void *dev_id)
                                input_report_key(dev, event->key.keycode,
                                                 event->key.pressed);
                        else
-                               printk(KERN_WARNING
-                                      "xenkbd: unhandled keycode 0x%x\n",
-                                      event->key.keycode);
+                               pr_warning("unhandled keycode 0x%x\n",
+                                          event->key.keycode);
                        break;
                case XENKBD_TYPE_POS:
                        input_report_abs(dev, ABS_X, event->pos.abs_x);
@@ -292,8 +293,7 @@ InitWait:
                        ret = xenbus_printf(XBT_NIL, info->xbdev->nodename,
                                            "request-abs-pointer", "1");
                        if (ret)
-                               printk(KERN_WARNING
-                                      "xenkbd: can't request abs-pointer");
+                               pr_warning("can't request abs-pointer\n");
                }
                xenbus_switch_state(dev, XenbusStateConnected);
                break;