From 93d372ca7b4332c21ccf7f8524139cb97b6baaad Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 15 Mar 2004 21:07:31 +0100 Subject: [PATCH] [Bluetooth] Declare more functions static This patch declares all possible functions static. --- drivers/bluetooth/bcm203x.c | 4 ++-- drivers/bluetooth/bfusb.c | 4 ++-- drivers/bluetooth/hci_ldisc.c | 6 +++--- drivers/bluetooth/hci_usb.c | 6 +++--- net/bluetooth/af_bluetooth.c | 6 +++--- net/bluetooth/bnep/core.c | 8 ++++---- net/bluetooth/cmtp/core.c | 8 ++++---- net/bluetooth/l2cap.c | 12 ++++++------ net/bluetooth/rfcomm/core.c | 6 +++--- net/bluetooth/sco.c | 24 ++++++++++++------------ 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c index 03c5df973d3c..d5f09ec1dbdd 100644 --- a/drivers/bluetooth/bcm203x.c +++ b/drivers/bluetooth/bcm203x.c @@ -296,13 +296,13 @@ static int __init bcm203x_init(void) return err; } -static void __exit bcm203x_cleanup(void) +static void __exit bcm203x_exit(void) { usb_deregister(&bcm203x_driver); } module_init(bcm203x_init); -module_exit(bcm203x_cleanup); +module_exit(bcm203x_exit); MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Broadcom Blutonium firmware driver ver " VERSION); diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 4efae3a97fce..30d2528d2b5e 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -779,13 +779,13 @@ static int __init bfusb_init(void) return err; } -static void __exit bfusb_cleanup(void) +static void __exit bfusb_exit(void) { usb_deregister(&bfusb_driver); } module_init(bfusb_init); -module_exit(bfusb_cleanup); +module_exit(bfusb_exit); MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("BlueFRITZ! USB driver ver " VERSION); diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 80031f5ed9bb..5964684d7527 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -521,7 +521,7 @@ int bcsp_init(void); int bcsp_deinit(void); #endif -int __init hci_uart_init(void) +static int __init hci_uart_init(void) { static struct tty_ldisc hci_uart_ldisc; int err; @@ -559,7 +559,7 @@ int __init hci_uart_init(void) return 0; } -void hci_uart_cleanup(void) +static void __exit hci_uart_exit(void) { int err; @@ -576,7 +576,7 @@ void hci_uart_cleanup(void) } module_init(hci_uart_init); -module_exit(hci_uart_cleanup); +module_exit(hci_uart_exit); MODULE_AUTHOR("Maxim Krasnyansky "); MODULE_DESCRIPTION("Bluetooth HCI UART driver ver " VERSION); diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 7af168947bdc..32e5a84264d3 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c @@ -991,7 +991,7 @@ static struct usb_driver hci_usb_driver = { .id_table = bluetooth_ids, }; -int hci_usb_init(void) +static int __init hci_usb_init(void) { int err; @@ -1003,13 +1003,13 @@ int hci_usb_init(void) return err; } -void hci_usb_cleanup(void) +static void __exit hci_usb_exit(void) { usb_deregister(&hci_usb_driver); } module_init(hci_usb_init); -module_exit(hci_usb_cleanup); +module_exit(hci_usb_exit); MODULE_AUTHOR("Maxim Krasnyansky , Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth HCI USB driver ver " VERSION); diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 1817c7919ce3..74b70f70e077 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -323,7 +323,7 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo) return err; } -struct net_proto_family bt_sock_family_ops = { +static struct net_proto_family bt_sock_family_ops = { .owner = THIS_MODULE, .family = PF_BLUETOOTH, .create = bt_sock_create, @@ -364,7 +364,7 @@ static int __init bt_init(void) return 0; } -static void __exit bt_cleanup(void) +static void __exit bt_exit(void) { hci_sock_cleanup(); @@ -377,7 +377,7 @@ static void __exit bt_cleanup(void) } subsys_initcall(bt_init); -module_exit(bt_cleanup); +module_exit(bt_exit); MODULE_AUTHOR("Maxim Krasnyansky , Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth Core ver " VERSION); diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 81d4e82cfa95..5292b6c50975 100644 --- a/net/bluetooth/bnep/core.c +++ b/net/bluetooth/bnep/core.c @@ -672,7 +672,7 @@ int bnep_get_conninfo(struct bnep_conninfo *ci) return err; } -static int __init bnep_init_module(void) +static int __init bnep_init(void) { char flt[50] = ""; @@ -694,13 +694,13 @@ static int __init bnep_init_module(void) return 0; } -static void __exit bnep_cleanup_module(void) +static void __exit bnep_exit(void) { bnep_sock_cleanup(); } -module_init(bnep_init_module); -module_exit(bnep_cleanup_module); +module_init(bnep_init); +module_exit(bnep_exit); MODULE_AUTHOR("David Libault , Maxim Krasnyansky "); MODULE_DESCRIPTION("Bluetooth BNEP ver " VERSION); diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index d0d3d086e1c0..1aadecd45d7e 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c @@ -482,7 +482,7 @@ int cmtp_get_conninfo(struct cmtp_conninfo *ci) } -int __init init_cmtp(void) +static int __init cmtp_init(void) { l2cap_load(); @@ -493,13 +493,13 @@ int __init init_cmtp(void) return 0; } -void __exit exit_cmtp(void) +static void __exit cmtp_exit(void) { cmtp_cleanup_sockets(); } -module_init(init_cmtp); -module_exit(exit_cmtp); +module_init(cmtp_init); +module_exit(cmtp_exit); MODULE_AUTHOR("Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth CMTP ver " VERSION); diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 56a91a619743..68f325798859 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -535,7 +535,7 @@ done: return err; } -int l2cap_sock_listen(struct socket *sock, int backlog) +static int l2cap_sock_listen(struct socket *sock, int backlog) { struct sock *sk = sock->sk; int err = 0; @@ -563,7 +563,7 @@ done: return err; } -int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int flags) +static int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int flags) { DECLARE_WAITQUEUE(wait, current); struct sock *sk = sock->sk, *nsk; @@ -1051,7 +1051,7 @@ static void l2cap_chan_ready(struct sock *sk) } /* Copy frame to all raw sockets on that connection */ -void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb) +static void l2cap_raw_recv(struct l2cap_conn *conn, struct sk_buff *skb) { struct l2cap_chan_list *l = &conn->chan_list; struct sk_buff *nskb; @@ -2153,7 +2153,7 @@ static struct hci_proto l2cap_hci_proto = { .recv_acldata = l2cap_recv_acldata }; -int __init l2cap_init(void) +static int __init l2cap_init(void) { int err; @@ -2175,7 +2175,7 @@ int __init l2cap_init(void) return 0; } -void __exit l2cap_cleanup(void) +static void __exit l2cap_exit(void) { l2cap_proc_cleanup(); @@ -2197,7 +2197,7 @@ void l2cap_load(void) EXPORT_SYMBOL(l2cap_load); module_init(l2cap_init); -module_exit(l2cap_cleanup); +module_exit(l2cap_exit); MODULE_AUTHOR("Maxim Krasnyansky "); MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION); diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 090ff6db0fb5..2e7e3ec4c0a5 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -1948,7 +1948,7 @@ static void __exit rfcomm_proc_cleanup(void) #endif /* CONFIG_PROC_FS */ /* ---- Initialization ---- */ -int __init rfcomm_init(void) +static int __init rfcomm_init(void) { l2cap_load(); @@ -1967,7 +1967,7 @@ int __init rfcomm_init(void) return 0; } -void __exit rfcomm_cleanup(void) +static void __exit rfcomm_exit(void) { /* Terminate working thread. * ie. Set terminate flag and wake it up */ @@ -1988,7 +1988,7 @@ void __exit rfcomm_cleanup(void) } module_init(rfcomm_init); -module_exit(rfcomm_cleanup); +module_exit(rfcomm_exit); MODULE_AUTHOR("Maxim Krasnyansky , Marcel Holtmann "); MODULE_DESCRIPTION("Bluetooth RFCOMM ver " VERSION); diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 4ccc42d2c904..ab9053b8e150 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -194,7 +194,7 @@ static inline int sco_chan_add(struct sco_conn *conn, struct sock *sk, struct so return err; } -int sco_connect(struct sock *sk) +static int sco_connect(struct sock *sk) { bdaddr_t *src = &bt_sk(sk)->src; bdaddr_t *dst = &bt_sk(sk)->dst; @@ -533,7 +533,7 @@ done: return err; } -int sco_sock_listen(struct socket *sock, int backlog) +static int sco_sock_listen(struct socket *sock, int backlog) { struct sock *sk = sock->sk; int err = 0; @@ -556,7 +556,7 @@ done: return err; } -int sco_sock_accept(struct socket *sock, struct socket *newsock, int flags) +static int sco_sock_accept(struct socket *sock, struct socket *newsock, int flags) { DECLARE_WAITQUEUE(wait, current); struct sock *sk = sock->sk, *ch; @@ -655,7 +655,7 @@ static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, return err; } -int sco_sock_setsockopt(struct socket *sock, int level, int optname, char *optval, int optlen) +static int sco_sock_setsockopt(struct socket *sock, int level, int optname, char *optval, int optlen) { struct sock *sk = sock->sk; int err = 0; @@ -674,7 +674,7 @@ int sco_sock_setsockopt(struct socket *sock, int level, int optname, char *optva return err; } -int sco_sock_getsockopt(struct socket *sock, int level, int optname, char *optval, int *optlen) +static int sco_sock_getsockopt(struct socket *sock, int level, int optname, char *optval, int *optlen) { struct sock *sk = sock->sk; struct sco_options opts; @@ -835,7 +835,7 @@ done: } /* ----- SCO interface with lower layer (HCI) ----- */ -int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type) +static int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type) { BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr)); @@ -843,7 +843,7 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 type) return HCI_LM_ACCEPT; } -int sco_connect_cfm(struct hci_conn *hcon, __u8 status) +static int sco_connect_cfm(struct hci_conn *hcon, __u8 status) { BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status); @@ -862,7 +862,7 @@ int sco_connect_cfm(struct hci_conn *hcon, __u8 status) return 0; } -int sco_disconn_ind(struct hci_conn *hcon, __u8 reason) +static int sco_disconn_ind(struct hci_conn *hcon, __u8 reason) { BT_DBG("hcon %p reason %d", hcon, reason); @@ -873,7 +873,7 @@ int sco_disconn_ind(struct hci_conn *hcon, __u8 reason) return 0; } -int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) +static int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) { struct sco_conn *conn = hcon->sco_data; @@ -1013,7 +1013,7 @@ static struct hci_proto sco_hci_proto = { .recv_scodata = sco_recv_scodata }; -int __init sco_init(void) +static int __init sco_init(void) { int err; @@ -1035,7 +1035,7 @@ int __init sco_init(void) return 0; } -void __exit sco_cleanup(void) +static void __exit sco_exit(void) { int err; @@ -1050,7 +1050,7 @@ void __exit sco_cleanup(void) } module_init(sco_init); -module_exit(sco_cleanup); +module_exit(sco_exit); MODULE_AUTHOR("Maxim Krasnyansky "); MODULE_DESCRIPTION("Bluetooth SCO ver " VERSION); -- 2.39.5