diff options
author | Joe Perches <joe@perches.com> | 2011-11-29 11:37:34 -0800 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-11-30 15:08:37 -0500 |
commit | 538af1344ab21cd2b638e779c2e82550a886b26e (patch) | |
tree | 1a2114502d6addc611041ac12af202ad48eb2018 | |
parent | 20c239c1390bd6f3bb389fe1a7e8307f29f52563 (diff) | |
download | linux-next-538af1344ab21cd2b638e779c2e82550a886b26e.tar.gz |
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>
-rw-r--r-- | net/nfc/core.c | 19 | ||||
-rw-r--r-- | net/nfc/nfc.h | 7 |
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 @@ 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/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 @@ #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; |