Browse Source

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>
Axel Lin 11 years ago
parent
commit
0b51fc5633
2 changed files with 2 additions and 6 deletions
  1. 1 3
      net/nfc/hci/llc.c
  2. 1 3
      net/nfc/llcp_core.c

+ 1 - 3
net/nfc/hci/llc.c

@@ -20,14 +20,12 @@
 
 
 #include "llc.h"
 #include "llc.h"
 
 
-static struct list_head llc_engines;
+static LIST_HEAD(llc_engines);
 
 
 int nfc_llc_init(void)
 int nfc_llc_init(void)
 {
 {
 	int r;
 	int r;
 
 
-	INIT_LIST_HEAD(&llc_engines);
-
 	r = nfc_llc_nop_register();
 	r = nfc_llc_nop_register();
 	if (r)
 	if (r)
 		goto exit;
 		goto exit;

+ 1 - 3
net/nfc/llcp_core.c

@@ -27,7 +27,7 @@
 
 
 static u8 llcp_magic[3] = {0x46, 0x66, 0x6d};
 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);
 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)
 int __init nfc_llcp_init(void)
 {
 {
-	INIT_LIST_HEAD(&llcp_devices);
-
 	return nfc_llcp_sock_init();
 	return nfc_llcp_sock_init();
 }
 }