From 4f438360e426ed616c4ae8e442ed1248d182997a Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Tue, 29 Nov 2011 11:37:34 -0800
Subject: [PATCH] --- yaml --- r: 278461 b: refs/heads/master c:
 538af1344ab21cd2b638e779c2e82550a886b26e h: refs/heads/master i:   278459:
 b4c5cd091f77a73759fae91a4196f5f1ce7b0fc6 v: v3

---
 [refs]               |  2 +-
 trunk/net/nfc/core.c | 19 -------------------
 trunk/net/nfc/nfc.h  |  7 -------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 2a9bf8576804..bbdcefb63f34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20c239c1390bd6f3bb389fe1a7e8307f29f52563
+refs/heads/master: 538af1344ab21cd2b638e779c2e82550a886b26e
diff --git a/trunk/net/nfc/core.c b/trunk/net/nfc/core.c
index c922adb9e651..3ebc6b3aabac 100644
--- a/trunk/net/nfc/core.c
+++ b/trunk/net/nfc/core.c
@@ -35,25 +35,6 @@
 int nfc_devlist_generation;
 DEFINE_MUTEX(nfc_devlist_mutex);
 
-int nfc_printk(const char *level, const char *format, ...)
-{
-	struct va_format vaf;
-	va_list args;
-	int r;
-
-	va_start(args, format);
-
-	vaf.fmt = format;
-	vaf.va = &args;
-
-	r = printk("%sNFC: %pV\n", level, &vaf);
-
-	va_end(args);
-
-	return r;
-}
-EXPORT_SYMBOL(nfc_printk);
-
 /**
  * nfc_dev_up - turn on the NFC device
  *
diff --git a/trunk/net/nfc/nfc.h b/trunk/net/nfc/nfc.h
index d86583f4831d..67d605015304 100644
--- a/trunk/net/nfc/nfc.h
+++ b/trunk/net/nfc/nfc.h
@@ -27,13 +27,6 @@
 #include <net/nfc/nfc.h>
 #include <net/sock.h>
 
-__printf(2, 3)
-int nfc_printk(const char *level, const char *fmt, ...);
-
-#define nfc_info(fmt, arg...) nfc_printk(KERN_INFO, fmt, ##arg)
-#define nfc_err(fmt, arg...) nfc_printk(KERN_ERR, fmt, ##arg)
-#define nfc_dbg(fmt, arg...) pr_debug(fmt "\n", ##arg)
-
 struct nfc_protocol {
 	int id;
 	struct proto *proto;