---

yaml --- r: 278461 b: refs/heads/master c: 538af13 h: refs/heads/master i: 278459: b4c5cd0 v: v3
git-mirror · Nov 30, 2011 · 4f43836 · 4f43836
1 parent 5b04339
commit 4f43836
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 27 deletions.
diff --git 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
@@ -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
@@ -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;