From 9186faf0ed88fef97cd9e220d1a4fb258a016d3c Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Tue, 25 Sep 2012 12:42:50 +0200 Subject: [PATCH] --- yaml --- r: 328316 b: refs/heads/master c: fe235b58d517d623bf6d40c77afca1b0ee6fc85d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/nfc/hci/llc.h | 8 -------- trunk/net/nfc/llcp/llcp.c | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 3ccd712c99ce..11acff653bba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a14e8bf386434732eed6678120fe52acee6244a +refs/heads/master: fe235b58d517d623bf6d40c77afca1b0ee6fc85d diff --git a/trunk/net/nfc/hci/llc.h b/trunk/net/nfc/hci/llc.h index 7be0b7f3ceb6..c7014fdfc8c9 100644 --- a/trunk/net/nfc/hci/llc.h +++ b/trunk/net/nfc/hci/llc.h @@ -56,14 +56,6 @@ int nfc_llc_register(const char *name, struct nfc_llc_ops *ops); void nfc_llc_unregister(const char *name); int nfc_llc_nop_register(void); - -#if defined(CONFIG_NFC_SHDLC) int nfc_llc_shdlc_register(void); -#else -static inline int nfc_llc_shdlc_register(void) -{ - return 0; -} -#endif #endif /* __LOCAL_LLC_H_ */ diff --git a/trunk/net/nfc/llcp/llcp.c b/trunk/net/nfc/llcp/llcp.c index 90ef4a176819..d649fbf39d58 100644 --- a/trunk/net/nfc/llcp/llcp.c +++ b/trunk/net/nfc/llcp/llcp.c @@ -1156,8 +1156,8 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) INIT_WORK(&local->timeout_work, nfc_llcp_timeout_work); - local->sockets.lock = __RW_LOCK_UNLOCKED(local->sockets.lock); - local->connecting_sockets.lock = __RW_LOCK_UNLOCKED(local->connecting_sockets.lock); + rwlock_init(&local->sockets.lock); + rwlock_init(&local->connecting_sockets.lock); nfc_llcp_build_gb(local);