aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-09-23 14:37:36 -0400
committerDavid S. Miller <davem@davemloft.net>2013-09-23 16:29:41 -0400
commite74e58f8d2015ac6b4e7a65c0acde8a499d46574 (patch)
tree94671bfce75751caa2f5c57d5d49dd589e5ad3e4
parentd511337a1eda35ac9d8e373e1cca17d6182a75b7 (diff)
bluetooth: Remove extern from function prototypes
There are a mix of function prototypes with and without extern in the kernel sources. Standardize on not using extern for function prototypes. Function prototypes don't need to be written with extern. extern is assumed by the compiler. Its use is as unnecessary as using auto to declare automatic/local variables in a block. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/bluetooth/bluetooth.h16
-rw-r--r--include/net/bluetooth/hci_core.h23
-rw-r--r--include/net/bluetooth/rfcomm.h4
3 files changed, 21 insertions, 22 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 10d43d8c7037..13d6c3929759 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -331,16 +331,16 @@ out:
331 331
332int bt_to_errno(__u16 code); 332int bt_to_errno(__u16 code);
333 333
334extern int hci_sock_init(void); 334int hci_sock_init(void);
335extern void hci_sock_cleanup(void); 335void hci_sock_cleanup(void);
336 336
337extern int bt_sysfs_init(void); 337int bt_sysfs_init(void);
338extern void bt_sysfs_cleanup(void); 338void bt_sysfs_cleanup(void);
339 339
340extern int bt_procfs_init(struct net *net, const char *name, 340int bt_procfs_init(struct net *net, const char *name,
341 struct bt_sock_list* sk_list, 341 struct bt_sock_list *sk_list,
342 int (* seq_show)(struct seq_file *, void *)); 342 int (*seq_show)(struct seq_file *, void *));
343extern void bt_procfs_cleanup(struct net *net, const char *name); 343void bt_procfs_cleanup(struct net *net, const char *name);
344 344
345extern struct dentry *bt_debugfs; 345extern struct dentry *bt_debugfs;
346 346
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 3ede820d328f..5769061e6533 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -367,18 +367,17 @@ extern rwlock_t hci_dev_list_lock;
367extern rwlock_t hci_cb_list_lock; 367extern rwlock_t hci_cb_list_lock;
368 368
369/* ----- HCI interface to upper protocols ----- */ 369/* ----- HCI interface to upper protocols ----- */
370extern int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr); 370int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);
371extern void l2cap_connect_cfm(struct hci_conn *hcon, u8 status); 371void l2cap_connect_cfm(struct hci_conn *hcon, u8 status);
372extern int l2cap_disconn_ind(struct hci_conn *hcon); 372int l2cap_disconn_ind(struct hci_conn *hcon);
373extern void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason); 373void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason);
374extern int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt); 374int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt);
375extern int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, 375int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags);
376 u16 flags); 376
377 377int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags);
378extern int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags); 378void sco_connect_cfm(struct hci_conn *hcon, __u8 status);
379extern void sco_connect_cfm(struct hci_conn *hcon, __u8 status); 379void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason);
380extern void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason); 380int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);
381extern int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);
382 381
383/* ----- Inquiry cache ----- */ 382/* ----- Inquiry cache ----- */
384#define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ 383#define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index 7afd4199d6b6..b7f43e76a5c5 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -256,8 +256,8 @@ static inline void rfcomm_dlc_put(struct rfcomm_dlc *d)
256 rfcomm_dlc_free(d); 256 rfcomm_dlc_free(d);
257} 257}
258 258
259extern void __rfcomm_dlc_throttle(struct rfcomm_dlc *d); 259void __rfcomm_dlc_throttle(struct rfcomm_dlc *d);
260extern void __rfcomm_dlc_unthrottle(struct rfcomm_dlc *d); 260void __rfcomm_dlc_unthrottle(struct rfcomm_dlc *d);
261 261
262static inline void rfcomm_dlc_throttle(struct rfcomm_dlc *d) 262static inline void rfcomm_dlc_throttle(struct rfcomm_dlc *d)
263{ 263{