aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-11-29 14:37:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-30 15:08:37 -0500
commit538af1344ab21cd2b638e779c2e82550a886b26e (patch)
tree1a2114502d6addc611041ac12af202ad48eb2018 /net/nfc
parent20c239c1390bd6f3bb389fe1a7e8307f29f52563 (diff)
nfc: Remove unused nfc_printk and nfc_<level> macros
All uses have been removed, so killing what's not necessary. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/core.c19
-rw-r--r--net/nfc/nfc.h7
2 files changed, 0 insertions, 26 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c
index c922adb9e651..3ebc6b3aabac 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -35,25 +35,6 @@
35int nfc_devlist_generation; 35int nfc_devlist_generation;
36DEFINE_MUTEX(nfc_devlist_mutex); 36DEFINE_MUTEX(nfc_devlist_mutex);
37 37
38int nfc_printk(const char *level, const char *format, ...)
39{
40 struct va_format vaf;
41 va_list args;
42 int r;
43
44 va_start(args, format);
45
46 vaf.fmt = format;
47 vaf.va = &args;
48
49 r = printk("%sNFC: %pV\n", level, &vaf);
50
51 va_end(args);
52
53 return r;
54}
55EXPORT_SYMBOL(nfc_printk);
56
57/** 38/**
58 * nfc_dev_up - turn on the NFC device 39 * nfc_dev_up - turn on the NFC device
59 * 40 *
diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h
index d86583f4831d..67d605015304 100644
--- a/net/nfc/nfc.h
+++ b/net/nfc/nfc.h
@@ -27,13 +27,6 @@
27#include <net/nfc/nfc.h> 27#include <net/nfc/nfc.h>
28#include <net/sock.h> 28#include <net/sock.h>
29 29
30__printf(2, 3)
31int nfc_printk(const char *level, const char *fmt, ...);
32
33#define nfc_info(fmt, arg...) nfc_printk(KERN_INFO, fmt, ##arg)
34#define nfc_err(fmt, arg...) nfc_printk(KERN_ERR, fmt, ##arg)
35#define nfc_dbg(fmt, arg...) pr_debug(fmt "\n", ##arg)
36
37struct nfc_protocol { 30struct nfc_protocol {
38 int id; 31 int id;
39 struct proto *proto; 32 struct proto *proto;