From e4d1f45cd6461dd9cff535bc17ed3af67b5abc3c Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 21 Aug 2011 19:56:47 -0300
Subject: [PATCH] --- yaml --- r: 271731 b: refs/heads/master c:
 d8a10ac948545d8a4261728719af39b5dffaf7da h: refs/heads/master i:   271729:
 21a84e6abb21a74affb3741c51f80030e725a8da   271727:
 78d5493aeb28cee0c83315008ac3881d41df3713 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/media/rc/winbond-cir.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ef1275ff5777..c6e39d4291c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7de3461c93a6d65355113cca333723eb8a1a0225
+refs/heads/master: d8a10ac948545d8a4261728719af39b5dffaf7da
diff --git a/trunk/drivers/media/rc/winbond-cir.c b/trunk/drivers/media/rc/winbond-cir.c
index bec8abc965f7..13f54b51194a 100644
--- a/trunk/drivers/media/rc/winbond-cir.c
+++ b/trunk/drivers/media/rc/winbond-cir.c
@@ -41,6 +41,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/pnp.h>
 #include <linux/interrupt.h>
@@ -1155,12 +1157,12 @@ wbcir_init(void)
 	case IR_PROTOCOL_RC6:
 		break;
 	default:
-		printk(KERN_ERR DRVNAME ": Invalid power-on protocol\n");
+		pr_err("Invalid power-on protocol\n");
 	}
 
 	ret = pnp_register_driver(&wbcir_driver);
 	if (ret)
-		printk(KERN_ERR DRVNAME ": Unable to register driver\n");
+		pr_err("Unable to register driver\n");
 
 	return ret;
 }