diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-02-22 09:14:18 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2014-02-23 17:34:09 -0500 |
commit | 0b51fc5633df563695f5021bc121a9df20b3eb14 (patch) | |
tree | 30fbe7320113f6aae986ff8c7d79bd0937c72390 /net | |
parent | 4f913d4631fa9c47320669b2e7ec62fa7436719d (diff) |
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')
-rw-r--r-- | net/nfc/hci/llc.c | 4 | ||||
-rw-r--r-- | net/nfc/llcp_core.c | 4 |
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 @@ | |||
20 | 20 | ||
21 | #include "llc.h" | 21 | #include "llc.h" |
22 | 22 | ||
23 | static struct list_head llc_engines; | 23 | static LIST_HEAD(llc_engines); |
24 | 24 | ||
25 | int nfc_llc_init(void) | 25 | int nfc_llc_init(void) |
26 | { | 26 | { |
27 | int r; | 27 | int r; |
28 | 28 | ||
29 | INIT_LIST_HEAD(&llc_engines); | ||
30 | |||
31 | r = nfc_llc_nop_register(); | 29 | r = nfc_llc_nop_register(); |
32 | if (r) | 30 | if (r) |
33 | goto exit; | 31 | 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 @@ | |||
27 | 27 | ||
28 | static u8 llcp_magic[3] = {0x46, 0x66, 0x6d}; | 28 | static u8 llcp_magic[3] = {0x46, 0x66, 0x6d}; |
29 | 29 | ||
30 | static struct list_head llcp_devices; | 30 | static LIST_HEAD(llcp_devices); |
31 | 31 | ||
32 | static void nfc_llcp_rx_skb(struct nfc_llcp_local *local, struct sk_buff *skb); | 32 | static void nfc_llcp_rx_skb(struct nfc_llcp_local *local, struct sk_buff *skb); |
33 | 33 | ||
@@ -1622,8 +1622,6 @@ void nfc_llcp_unregister_device(struct nfc_dev *dev) | |||
1622 | 1622 | ||
1623 | int __init nfc_llcp_init(void) | 1623 | int __init nfc_llcp_init(void) |
1624 | { | 1624 | { |
1625 | INIT_LIST_HEAD(&llcp_devices); | ||
1626 | |||
1627 | return nfc_llcp_sock_init(); | 1625 | return nfc_llcp_sock_init(); |
1628 | } | 1626 | } |
1629 | 1627 | ||