summaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-02-22 18:14:18 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2014-02-24 02:34:09 +0400
commit0b51fc5633df563695f5021bc121a9df20b3eb14 (patch)
tree30fbe7320113f6aae986ff8c7d79bd0937c72390 /net/nfc
parent4f913d4631fa9c47320669b2e7ec62fa7436719d (diff)
downloadlinux-0b51fc5633df563695f5021bc121a9df20b3eb14.tar.xz
NFC: Use LIST_HEAD() at appropriate places
Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/hci/llc.c4
-rw-r--r--net/nfc/llcp_core.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/net/nfc/hci/llc.c b/net/nfc/hci/llc.c
index a07d2b818487..1b90c0531852 100644
--- a/net/nfc/hci/llc.c
+++ b/net/nfc/hci/llc.c
@@ -20,14 +20,12 @@
#include "llc.h"
-static struct list_head llc_engines;
+static LIST_HEAD(llc_engines);
int nfc_llc_init(void)
{
int r;
- INIT_LIST_HEAD(&llc_engines);
-
r = nfc_llc_nop_register();
if (r)
goto exit;
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index 6184bd1fba3a..9d37dedec906 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -27,7 +27,7 @@
static u8 llcp_magic[3] = {0x46, 0x66, 0x6d};
-static struct list_head llcp_devices;
+static LIST_HEAD(llcp_devices);
static void nfc_llcp_rx_skb(struct nfc_llcp_local *local, struct sk_buff *skb);
@@ -1622,8 +1622,6 @@ void nfc_llcp_unregister_device(struct nfc_dev *dev)
int __init nfc_llcp_init(void)
{
- INIT_LIST_HEAD(&llcp_devices);
-
return nfc_llcp_sock_init();
}