aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2016-04-15 12:14:25 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2016-07-04 06:14:05 -0400
commitf86dec94e3a86c992a637df1c301a4df25a85801 (patch)
tree784ee785a37694518065e97fc6fbee7d9af171e9
parentf36acc334fb86da3761583dce50faa17a4cbd4de (diff)
NFC: hci: delete unused nfc_llc_get_rx_head_tail_room()
It used to be EXPORTed, but then EXPORT usage was cleaned up (in 2012), without noticing that the function has no users at all (and curiously, never had any users). Delete it. While at it, remove non-static "inline" hints on nearby functions: these hints don't work across compilation units anyway, and these functions are not used in their .c file, thus they are never inlined. IOW: "inline" here does not help in any way. Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com> CC: Samuel Ortiz <sameo@linux.intel.com> CC: Christophe Ricard <christophe.ricard@gmail.com> CC: linux-wireless@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--include/net/nfc/llc.h4
-rw-r--r--net/nfc/hci/llc.c17
2 files changed, 5 insertions, 16 deletions
diff --git a/include/net/nfc/llc.h b/include/net/nfc/llc.h
index c25fbdee0d61..7ecb45757897 100644
--- a/include/net/nfc/llc.h
+++ b/include/net/nfc/llc.h
@@ -37,10 +37,6 @@ struct nfc_llc *nfc_llc_allocate(const char *name, struct nfc_hci_dev *hdev,
37 int tx_tailroom, llc_failure_t llc_failure); 37 int tx_tailroom, llc_failure_t llc_failure);
38void nfc_llc_free(struct nfc_llc *llc); 38void nfc_llc_free(struct nfc_llc *llc);
39 39
40void nfc_llc_get_rx_head_tail_room(struct nfc_llc *llc, int *rx_headroom,
41 int *rx_tailroom);
42
43
44int nfc_llc_start(struct nfc_llc *llc); 40int nfc_llc_start(struct nfc_llc *llc);
45int nfc_llc_stop(struct nfc_llc *llc); 41int nfc_llc_stop(struct nfc_llc *llc);
46void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb); 42void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb);
diff --git a/net/nfc/hci/llc.c b/net/nfc/hci/llc.c
index 1399a03fa6e6..3d699cbc7435 100644
--- a/net/nfc/hci/llc.c
+++ b/net/nfc/hci/llc.c
@@ -133,36 +133,29 @@ void nfc_llc_free(struct nfc_llc *llc)
133 kfree(llc); 133 kfree(llc);
134} 134}
135 135
136inline void nfc_llc_get_rx_head_tail_room(struct nfc_llc *llc, int *rx_headroom, 136int nfc_llc_start(struct nfc_llc *llc)
137 int *rx_tailroom)
138{
139 *rx_headroom = llc->rx_headroom;
140 *rx_tailroom = llc->rx_tailroom;
141}
142
143inline int nfc_llc_start(struct nfc_llc *llc)
144{ 137{
145 return llc->ops->start(llc); 138 return llc->ops->start(llc);
146} 139}
147EXPORT_SYMBOL(nfc_llc_start); 140EXPORT_SYMBOL(nfc_llc_start);
148 141
149inline int nfc_llc_stop(struct nfc_llc *llc) 142int nfc_llc_stop(struct nfc_llc *llc)
150{ 143{
151 return llc->ops->stop(llc); 144 return llc->ops->stop(llc);
152} 145}
153EXPORT_SYMBOL(nfc_llc_stop); 146EXPORT_SYMBOL(nfc_llc_stop);
154 147
155inline void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb) 148void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb)
156{ 149{
157 llc->ops->rcv_from_drv(llc, skb); 150 llc->ops->rcv_from_drv(llc, skb);
158} 151}
159 152
160inline int nfc_llc_xmit_from_hci(struct nfc_llc *llc, struct sk_buff *skb) 153int nfc_llc_xmit_from_hci(struct nfc_llc *llc, struct sk_buff *skb)
161{ 154{
162 return llc->ops->xmit_from_hci(llc, skb); 155 return llc->ops->xmit_from_hci(llc, skb);
163} 156}
164 157
165inline void *nfc_llc_get_data(struct nfc_llc *llc) 158void *nfc_llc_get_data(struct nfc_llc *llc)
166{ 159{
167 return llc->data; 160 return llc->data;
168} 161}