aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-09-18 13:17:33 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-24 18:17:26 -0400
commitf4f20d0650e9cd13f65b5e7f93af126b526af721 (patch)
tree2b288b8267fe136556da3a38889f80ecca3a370d /net
parent412fda538f4b1317ecd0fbe6e5bc9124792bea88 (diff)
NFC: Remove unneeded LLC symbols export
After fixing the LLC Makefile, we no longer need those exports. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/hci/llc.c14
-rw-r--r--net/nfc/hci/llc_nop.c2
-rw-r--r--net/nfc/hci/llc_shdlc.c2
3 files changed, 1 insertions, 17 deletions
diff --git a/net/nfc/hci/llc.c b/net/nfc/hci/llc.c
index bd11b0f7658a..ae1205ded87f 100644
--- a/net/nfc/hci/llc.c
+++ b/net/nfc/hci/llc.c
@@ -18,8 +18,8 @@
18 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 18 * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 */ 19 */
20 20
21#include <linux/export.h>
22#include <net/nfc/llc.h> 21#include <net/nfc/llc.h>
22
23#include "llc.h" 23#include "llc.h"
24 24
25static struct list_head llc_engines; 25static struct list_head llc_engines;
@@ -44,7 +44,6 @@ exit:
44 nfc_llc_exit(); 44 nfc_llc_exit();
45 return r; 45 return r;
46} 46}
47EXPORT_SYMBOL(nfc_llc_init);
48 47
49void nfc_llc_exit(void) 48void nfc_llc_exit(void)
50{ 49{
@@ -56,7 +55,6 @@ void nfc_llc_exit(void)
56 kfree(llc_engine); 55 kfree(llc_engine);
57 } 56 }
58} 57}
59EXPORT_SYMBOL(nfc_llc_exit);
60 58
61int nfc_llc_register(const char *name, struct nfc_llc_ops *ops) 59int nfc_llc_register(const char *name, struct nfc_llc_ops *ops)
62{ 60{
@@ -78,7 +76,6 @@ int nfc_llc_register(const char *name, struct nfc_llc_ops *ops)
78 76
79 return 0; 77 return 0;
80} 78}
81EXPORT_SYMBOL(nfc_llc_register);
82 79
83static struct nfc_llc_engine *nfc_llc_name_to_engine(const char *name) 80static struct nfc_llc_engine *nfc_llc_name_to_engine(const char *name)
84{ 81{
@@ -104,7 +101,6 @@ void nfc_llc_unregister(const char *name)
104 kfree(llc_engine->name); 101 kfree(llc_engine->name);
105 kfree(llc_engine); 102 kfree(llc_engine);
106} 103}
107EXPORT_SYMBOL(nfc_llc_unregister);
108 104
109struct nfc_llc *nfc_llc_allocate(const char *name, struct nfc_hci_dev *hdev, 105struct nfc_llc *nfc_llc_allocate(const char *name, struct nfc_hci_dev *hdev,
110 xmit_to_drv_t xmit_to_drv, 106 xmit_to_drv_t xmit_to_drv,
@@ -134,14 +130,12 @@ struct nfc_llc *nfc_llc_allocate(const char *name, struct nfc_hci_dev *hdev,
134 130
135 return llc; 131 return llc;
136} 132}
137EXPORT_SYMBOL(nfc_llc_allocate);
138 133
139void nfc_llc_free(struct nfc_llc *llc) 134void nfc_llc_free(struct nfc_llc *llc)
140{ 135{
141 llc->ops->deinit(llc); 136 llc->ops->deinit(llc);
142 kfree(llc); 137 kfree(llc);
143} 138}
144EXPORT_SYMBOL(nfc_llc_free);
145 139
146inline void nfc_llc_get_rx_head_tail_room(struct nfc_llc *llc, int *rx_headroom, 140inline void nfc_llc_get_rx_head_tail_room(struct nfc_llc *llc, int *rx_headroom,
147 int *rx_tailroom) 141 int *rx_tailroom)
@@ -149,34 +143,28 @@ inline void nfc_llc_get_rx_head_tail_room(struct nfc_llc *llc, int *rx_headroom,
149 *rx_headroom = llc->rx_headroom; 143 *rx_headroom = llc->rx_headroom;
150 *rx_tailroom = llc->rx_tailroom; 144 *rx_tailroom = llc->rx_tailroom;
151} 145}
152EXPORT_SYMBOL(nfc_llc_get_rx_head_tail_room);
153 146
154inline int nfc_llc_start(struct nfc_llc *llc) 147inline int nfc_llc_start(struct nfc_llc *llc)
155{ 148{
156 return llc->ops->start(llc); 149 return llc->ops->start(llc);
157} 150}
158EXPORT_SYMBOL(nfc_llc_start);
159 151
160inline int nfc_llc_stop(struct nfc_llc *llc) 152inline int nfc_llc_stop(struct nfc_llc *llc)
161{ 153{
162 return llc->ops->stop(llc); 154 return llc->ops->stop(llc);
163} 155}
164EXPORT_SYMBOL(nfc_llc_stop);
165 156
166inline void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb) 157inline void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb)
167{ 158{
168 llc->ops->rcv_from_drv(llc, skb); 159 llc->ops->rcv_from_drv(llc, skb);
169} 160}
170EXPORT_SYMBOL(nfc_llc_rcv_from_drv);
171 161
172inline int nfc_llc_xmit_from_hci(struct nfc_llc *llc, struct sk_buff *skb) 162inline int nfc_llc_xmit_from_hci(struct nfc_llc *llc, struct sk_buff *skb)
173{ 163{
174 return llc->ops->xmit_from_hci(llc, skb); 164 return llc->ops->xmit_from_hci(llc, skb);
175} 165}
176EXPORT_SYMBOL(nfc_llc_xmit_from_hci);
177 166
178inline void *nfc_llc_get_data(struct nfc_llc *llc) 167inline void *nfc_llc_get_data(struct nfc_llc *llc)
179{ 168{
180 return llc->data; 169 return llc->data;
181} 170}
182EXPORT_SYMBOL(nfc_llc_get_data);
diff --git a/net/nfc/hci/llc_nop.c b/net/nfc/hci/llc_nop.c
index ec627cee12cd..d91dd66a082d 100644
--- a/net/nfc/hci/llc_nop.c
+++ b/net/nfc/hci/llc_nop.c
@@ -19,7 +19,6 @@
19 */ 19 */
20 20
21#include <linux/types.h> 21#include <linux/types.h>
22#include <linux/export.h>
23 22
24#include "llc.h" 23#include "llc.h"
25 24
@@ -98,4 +97,3 @@ int nfc_llc_nop_register()
98{ 97{
99 return nfc_llc_register(LLC_NOP_NAME, &llc_nop_ops); 98 return nfc_llc_register(LLC_NOP_NAME, &llc_nop_ops);
100} 99}
101EXPORT_SYMBOL(nfc_llc_nop_register);
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index fad6cd18d613..3761c7490a61 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -22,7 +22,6 @@
22 22
23#include <linux/types.h> 23#include <linux/types.h>
24#include <linux/sched.h> 24#include <linux/sched.h>
25#include <linux/export.h>
26#include <linux/wait.h> 25#include <linux/wait.h>
27#include <linux/slab.h> 26#include <linux/slab.h>
28#include <linux/skbuff.h> 27#include <linux/skbuff.h>
@@ -831,4 +830,3 @@ int nfc_llc_shdlc_register()
831{ 830{
832 return nfc_llc_register(LLC_SHDLC_NAME, &llc_shdlc_ops); 831 return nfc_llc_register(LLC_SHDLC_NAME, &llc_shdlc_ops);
833} 832}
834EXPORT_SYMBOL(nfc_llc_shdlc_register);