From: Adrian Bunk <bunk@stusta.de>
To: Marcel Holtmann <marcel@holtmann.org>
Cc: Max Krasnyansky <maxk@qualcomm.com>,
bluez-devel@lists.sourceforge.net,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Network Development Mailing List <netdev@oss.sgi.com>
Subject: [2.6 patch] bluetooth: make some code static
Date: Sun, 19 Dec 2004 17:34:42 +0100 [thread overview]
Message-ID: <20041219163442.GC21288@stusta.de> (raw)
In-Reply-To: <20041219160758.GY21288@stusta.de>
The patch below makes some needlessly global code static.
diffstat output:
include/net/bluetooth/hci_core.h | 2 --
net/bluetooth/hci_conn.c | 2 +-
net/bluetooth/hci_core.c | 4 ++--
net/bluetooth/hci_sock.c | 10 +++++-----
net/bluetooth/l2cap.c | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
--- linux-2.6.10-rc3-mm1-full/include/net/bluetooth/hci_core.h.old 2004-12-14 02:13:54.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/include/net/bluetooth/hci_core.h 2004-12-14 02:31:34.000000000 +0100
@@ -277,7 +277,6 @@
return NULL;
}
-void hci_acl_connect(struct hci_conn *conn);
void hci_acl_disconn(struct hci_conn *conn, __u8 reason);
void hci_add_sco(struct hci_conn *conn, __u16 handle);
@@ -589,6 +583,5 @@
#define hci_req_unlock(d) up(&d->req_lock)
void hci_req_complete(struct hci_dev *hdev, int result);
-void hci_req_cancel(struct hci_dev *hdev, int err);
#endif /* __HCI_CORE_H */
--- linux-2.6.10-rc3-mm1-full/net/bluetooth/hci_conn.c.old 2004-12-14 02:14:10.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/net/bluetooth/hci_conn.c 2004-12-14 02:14:15.000000000 +0100
@@ -53,7 +53,7 @@
#define BT_DBG(D...)
#endif
-void hci_acl_connect(struct hci_conn *conn)
+static void hci_acl_connect(struct hci_conn *conn)
{
struct hci_dev *hdev = conn->hdev;
struct inquiry_entry *ie;
--- linux-2.6.10-rc3-mm1-full/net/bluetooth/hci_core.c.old 2004-12-14 02:14:53.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/net/bluetooth/hci_core.c 2004-12-14 02:31:09.000000000 +0100
@@ -59,7 +59,7 @@
static void hci_tx_task(unsigned long arg);
static void hci_notify(struct hci_dev *hdev, int event);
-rwlock_t hci_task_lock = RW_LOCK_UNLOCKED;
+static rwlock_t hci_task_lock = RW_LOCK_UNLOCKED;
/* HCI device list */
LIST_HEAD(hci_dev_list);
@@ -106,7 +106,7 @@
}
}
-void hci_req_cancel(struct hci_dev *hdev, int err)
+static void hci_req_cancel(struct hci_dev *hdev, int err)
{
BT_DBG("%s err 0x%2.2x", hdev->name, err);
--- linux-2.6.10-rc3-mm1-full/net/bluetooth/hci_sock.c.old 2004-12-14 02:16:59.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/net/bluetooth/hci_sock.c 2004-12-14 02:17:59.000000000 +0100
@@ -447,7 +447,7 @@
goto done;
}
-int hci_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int len)
+static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int len)
{
struct hci_ufilter uf = { .opcode = 0 };
struct sock *sk = sock->sk;
@@ -514,7 +514,7 @@
return err;
}
-int hci_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
+static int hci_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
{
struct hci_ufilter uf;
struct sock *sk = sock->sk;
@@ -567,7 +567,7 @@
return 0;
}
-struct proto_ops hci_sock_ops = {
+static struct proto_ops hci_sock_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.release = hci_sock_release,
@@ -647,13 +647,13 @@
return NOTIFY_DONE;
}
-struct net_proto_family hci_sock_family_ops = {
+static struct net_proto_family hci_sock_family_ops = {
.family = PF_BLUETOOTH,
.owner = THIS_MODULE,
.create = hci_sock_create,
};
-struct notifier_block hci_sock_nblock = {
+static struct notifier_block hci_sock_nblock = {
.notifier_call = hci_sock_dev_event
};
--- linux-2.6.10-rc3-mm1-full/net/bluetooth/l2cap.c.old 2004-12-14 02:18:13.000000000 +0100
+++ linux-2.6.10-rc3-mm1-full/net/bluetooth/l2cap.c 2004-12-14 02:18:21.000000000 +0100
@@ -61,7 +61,7 @@
static struct proto_ops l2cap_sock_ops;
-struct bt_sock_list l2cap_sk_list = {
+static struct bt_sock_list l2cap_sk_list = {
.lock = RW_LOCK_UNLOCKED
};
next prev parent reply other threads:[~2004-12-19 16:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-14 4:13 [2.6 patch] net/bluetooth/: misc possible cleanups Adrian Bunk
2004-12-14 7:34 ` Marcel Holtmann
2004-12-14 9:45 ` Christoph Hellwig
2004-12-14 9:54 ` Marcel Holtmann
2004-12-19 16:07 ` Adrian Bunk
2004-12-19 16:13 ` [2.6 patch] bluetooth/rfcomm/: make some code static Adrian Bunk
2004-12-19 16:34 ` [2.6 patch] bluetooth/cmtp/capi.c: make a function static Adrian Bunk
2004-12-19 16:34 ` Adrian Bunk [this message]
2004-12-26 11:20 ` [2.6 patch] net/bluetooth/: misc possible cleanups Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041219163442.GC21288@stusta.de \
--to=bunk@stusta.de \
--cc=bluez-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=marcel@holtmann.org \
--cc=maxk@qualcomm.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).