From 6297f8b9059b984b1280817a6a3a332b78f18e71 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Wed, 14 Dec 2011 16:43:05 +0100
Subject: [PATCH] --- yaml --- r: 278959 b: refs/heads/master c:
 52858b51b2c779a8f9db32accf774b165522ad81 h: refs/heads/master i:   278957:
 b386799d2eaa31bb1b68a0c9e1f9390c30fe1069   278955:
 00c01cbd8f5582559890dc101760b1b22f229c52   278951:
 85bc2351c6d3664efce33976d4c5623f49494ba8   278943:
 bc07f14675888f3655221f49036aee9f8c4e0f01 v: v3

---
 [refs]                   | 2 +-
 trunk/net/nfc/core.c     | 2 +-
 trunk/net/nfc/nci/core.c | 2 +-
 trunk/net/nfc/nci/data.c | 2 +-
 trunk/net/nfc/nci/ntf.c  | 2 +-
 trunk/net/nfc/nci/rsp.c  | 2 +-
 trunk/net/nfc/netlink.c  | 2 +-
 trunk/net/nfc/rawsock.c  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 6f33b118ffeb..56418ed8356e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4522ab1c469a65857ddd2d22d0d3f5606965aaa
+refs/heads/master: 52858b51b2c779a8f9db32accf774b165522ad81
diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c
index 3ebc6b3aabac..2a838b099d82 100644
--- a/trunk/net/nfc/core.c
+++ b/trunk/net/nfc/core.c
@@ -21,7 +21,7 @@
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/trunk/net/nfc/nci/core.c b/trunk/net/nfc/nci/core.c
index c55f233a5e2c..2deb4aebf568 100644
--- a/trunk/net/nfc/nci/core.c
+++ b/trunk/net/nfc/nci/core.c
@@ -25,7 +25,7 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <linux/types.h>
 #include <linux/workqueue.h>
diff --git a/trunk/net/nfc/nci/data.c b/trunk/net/nfc/nci/data.c
index 1e040feb2f84..e5756b30e602 100644
--- a/trunk/net/nfc/nci/data.c
+++ b/trunk/net/nfc/nci/data.c
@@ -21,7 +21,7 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <linux/types.h>
 #include <linux/interrupt.h>
diff --git a/trunk/net/nfc/nci/ntf.c b/trunk/net/nfc/nci/ntf.c
index c36bd4a09abb..003846b2c326 100644
--- a/trunk/net/nfc/nci/ntf.c
+++ b/trunk/net/nfc/nci/ntf.c
@@ -25,7 +25,7 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <linux/types.h>
 #include <linux/interrupt.h>
diff --git a/trunk/net/nfc/nci/rsp.c b/trunk/net/nfc/nci/rsp.c
index ca611c52aaaa..3f444c8a66e9 100644
--- a/trunk/net/nfc/nci/rsp.c
+++ b/trunk/net/nfc/nci/rsp.c
@@ -25,7 +25,7 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <linux/types.h>
 #include <linux/interrupt.h>
diff --git a/trunk/net/nfc/netlink.c b/trunk/net/nfc/netlink.c
index c10e9b8c5ad9..061711f47476 100644
--- a/trunk/net/nfc/netlink.c
+++ b/trunk/net/nfc/netlink.c
@@ -21,7 +21,7 @@
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <net/genetlink.h>
 #include <linux/nfc.h>
diff --git a/trunk/net/nfc/rawsock.c b/trunk/net/nfc/rawsock.c
index 68ecf3fa94e0..5e9b991eac13 100644
--- a/trunk/net/nfc/rawsock.c
+++ b/trunk/net/nfc/rawsock.c
@@ -21,7 +21,7 @@
  * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#define pr_fmt(fmt) KBUILD_MODNAME ": %s: " fmt, __func__
 
 #include <net/tcp_states.h>
 #include <linux/nfc.h>