diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2005-11-08 12:57:38 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2005-11-08 12:57:38 -0500 |
commit | be9d122730c878baafe11e70d1436faac229f2fc (patch) | |
tree | d6644129b56d7cff9fb9781154eebf97746f296b | |
parent | 1ebb92521d0bc2d4ef772730d29333c06b807191 (diff) |
[Bluetooth]: Remove the usage of /proc completely
This patch removes all relics of the /proc usage from the Bluetooth
subsystem core and its upper layers. All the previous information are
now available via /sys/class/bluetooth through appropriate functions.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/bluetooth/bluetooth.h | 4 | ||||
-rw-r--r-- | include/net/bluetooth/hci_core.h | 7 | ||||
-rw-r--r-- | include/net/bluetooth/rfcomm.h | 2 | ||||
-rw-r--r-- | net/bluetooth/af_bluetooth.c | 12 | ||||
-rw-r--r-- | net/bluetooth/hci_sysfs.c | 4 | ||||
-rw-r--r-- | net/bluetooth/l2cap.c | 98 | ||||
-rw-r--r-- | net/bluetooth/rfcomm/core.c | 124 | ||||
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 90 | ||||
-rw-r--r-- | net/bluetooth/sco.c | 92 |
9 files changed, 65 insertions, 368 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index e42d728b1620..911ceb5cd263 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
@@ -57,8 +57,6 @@ | |||
57 | #define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FUNCTION__ , ## arg) | 57 | #define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FUNCTION__ , ## arg) |
58 | #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FUNCTION__ , ## arg) | 58 | #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FUNCTION__ , ## arg) |
59 | 59 | ||
60 | extern struct proc_dir_entry *proc_bt; | ||
61 | |||
62 | /* Connection and socket states */ | 60 | /* Connection and socket states */ |
63 | enum { | 61 | enum { |
64 | BT_CONNECTED = 1, /* Equal to TCP_ESTABLISHED to make net code happy */ | 62 | BT_CONNECTED = 1, /* Equal to TCP_ESTABLISHED to make net code happy */ |
@@ -177,4 +175,6 @@ extern int hci_sock_cleanup(void); | |||
177 | extern int bt_sysfs_init(void); | 175 | extern int bt_sysfs_init(void); |
178 | extern void bt_sysfs_cleanup(void); | 176 | extern void bt_sysfs_cleanup(void); |
179 | 177 | ||
178 | extern struct class bt_class; | ||
179 | |||
180 | #endif /* __BLUETOOTH_H */ | 180 | #endif /* __BLUETOOTH_H */ |
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index adb94508259b..bb9f81dc8723 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -25,7 +25,6 @@ | |||
25 | #ifndef __HCI_CORE_H | 25 | #ifndef __HCI_CORE_H |
26 | #define __HCI_CORE_H | 26 | #define __HCI_CORE_H |
27 | 27 | ||
28 | #include <linux/proc_fs.h> | ||
29 | #include <net/bluetooth/hci.h> | 28 | #include <net/bluetooth/hci.h> |
30 | 29 | ||
31 | /* HCI upper protocols */ | 30 | /* HCI upper protocols */ |
@@ -34,8 +33,6 @@ | |||
34 | 33 | ||
35 | #define HCI_INIT_TIMEOUT (HZ * 10) | 34 | #define HCI_INIT_TIMEOUT (HZ * 10) |
36 | 35 | ||
37 | extern struct proc_dir_entry *proc_bt_hci; | ||
38 | |||
39 | /* HCI Core structures */ | 36 | /* HCI Core structures */ |
40 | 37 | ||
41 | struct inquiry_data { | 38 | struct inquiry_data { |
@@ -126,10 +123,6 @@ struct hci_dev { | |||
126 | 123 | ||
127 | atomic_t promisc; | 124 | atomic_t promisc; |
128 | 125 | ||
129 | #ifdef CONFIG_PROC_FS | ||
130 | struct proc_dir_entry *proc; | ||
131 | #endif | ||
132 | |||
133 | struct class_device class_dev; | 126 | struct class_device class_dev; |
134 | 127 | ||
135 | struct module *owner; | 128 | struct module *owner; |
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index e656be7c001a..bbfac86734ec 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h | |||
@@ -351,6 +351,4 @@ int rfcomm_dev_ioctl(struct sock *sk, unsigned int cmd, void __user *arg); | |||
351 | int rfcomm_init_ttys(void); | 351 | int rfcomm_init_ttys(void); |
352 | void rfcomm_cleanup_ttys(void); | 352 | void rfcomm_cleanup_ttys(void); |
353 | 353 | ||
354 | extern struct proc_dir_entry *proc_bt_rfcomm; | ||
355 | |||
356 | #endif /* __RFCOMM_H */ | 354 | #endif /* __RFCOMM_H */ |
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 03532062a46a..ea616e3fc98e 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/skbuff.h> | 36 | #include <linux/skbuff.h> |
37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
38 | #include <linux/poll.h> | 38 | #include <linux/poll.h> |
39 | #include <linux/proc_fs.h> | ||
40 | #include <net/sock.h> | 39 | #include <net/sock.h> |
41 | 40 | ||
42 | #if defined(CONFIG_KMOD) | 41 | #if defined(CONFIG_KMOD) |
@@ -50,10 +49,7 @@ | |||
50 | #define BT_DBG(D...) | 49 | #define BT_DBG(D...) |
51 | #endif | 50 | #endif |
52 | 51 | ||
53 | #define VERSION "2.7" | 52 | #define VERSION "2.8" |
54 | |||
55 | struct proc_dir_entry *proc_bt; | ||
56 | EXPORT_SYMBOL(proc_bt); | ||
57 | 53 | ||
58 | /* Bluetooth sockets */ | 54 | /* Bluetooth sockets */ |
59 | #define BT_MAX_PROTO 8 | 55 | #define BT_MAX_PROTO 8 |
@@ -312,10 +308,6 @@ static int __init bt_init(void) | |||
312 | { | 308 | { |
313 | BT_INFO("Core ver %s", VERSION); | 309 | BT_INFO("Core ver %s", VERSION); |
314 | 310 | ||
315 | proc_bt = proc_mkdir("bluetooth", NULL); | ||
316 | if (proc_bt) | ||
317 | proc_bt->owner = THIS_MODULE; | ||
318 | |||
319 | sock_register(&bt_sock_family_ops); | 311 | sock_register(&bt_sock_family_ops); |
320 | 312 | ||
321 | BT_INFO("HCI device and connection manager initialized"); | 313 | BT_INFO("HCI device and connection manager initialized"); |
@@ -334,8 +326,6 @@ static void __exit bt_exit(void) | |||
334 | bt_sysfs_cleanup(); | 326 | bt_sysfs_cleanup(); |
335 | 327 | ||
336 | sock_unregister(PF_BLUETOOTH); | 328 | sock_unregister(PF_BLUETOOTH); |
337 | |||
338 | remove_proc_entry("bluetooth", NULL); | ||
339 | } | 329 | } |
340 | 330 | ||
341 | subsys_initcall(bt_init); | 331 | subsys_initcall(bt_init); |
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 7856bc26accb..bd7568ac87fc 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
@@ -103,7 +103,7 @@ static void bt_release(struct class_device *cdev) | |||
103 | kfree(hdev); | 103 | kfree(hdev); |
104 | } | 104 | } |
105 | 105 | ||
106 | static struct class bt_class = { | 106 | struct class bt_class = { |
107 | .name = "bluetooth", | 107 | .name = "bluetooth", |
108 | .release = bt_release, | 108 | .release = bt_release, |
109 | #ifdef CONFIG_HOTPLUG | 109 | #ifdef CONFIG_HOTPLUG |
@@ -111,6 +111,8 @@ static struct class bt_class = { | |||
111 | #endif | 111 | #endif |
112 | }; | 112 | }; |
113 | 113 | ||
114 | EXPORT_SYMBOL_GPL(bt_class); | ||
115 | |||
114 | int hci_register_sysfs(struct hci_dev *hdev) | 116 | int hci_register_sysfs(struct hci_dev *hdev) |
115 | { | 117 | { |
116 | struct class_device *cdev = &hdev->class_dev; | 118 | struct class_device *cdev = &hdev->class_dev; |
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 59b2dd36baa7..e3bb11ca4235 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -38,9 +38,8 @@ | |||
38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #include <linux/socket.h> | 39 | #include <linux/socket.h> |
40 | #include <linux/skbuff.h> | 40 | #include <linux/skbuff.h> |
41 | #include <linux/proc_fs.h> | ||
42 | #include <linux/seq_file.h> | ||
43 | #include <linux/list.h> | 41 | #include <linux/list.h> |
42 | #include <linux/device.h> | ||
44 | #include <net/sock.h> | 43 | #include <net/sock.h> |
45 | 44 | ||
46 | #include <asm/system.h> | 45 | #include <asm/system.h> |
@@ -56,7 +55,7 @@ | |||
56 | #define BT_DBG(D...) | 55 | #define BT_DBG(D...) |
57 | #endif | 56 | #endif |
58 | 57 | ||
59 | #define VERSION "2.7" | 58 | #define VERSION "2.8" |
60 | 59 | ||
61 | static struct proto_ops l2cap_sock_ops; | 60 | static struct proto_ops l2cap_sock_ops; |
62 | 61 | ||
@@ -2137,94 +2136,29 @@ drop: | |||
2137 | return 0; | 2136 | return 0; |
2138 | } | 2137 | } |
2139 | 2138 | ||
2140 | /* ---- Proc fs support ---- */ | 2139 | static ssize_t l2cap_sysfs_show(struct class *dev, char *buf) |
2141 | #ifdef CONFIG_PROC_FS | ||
2142 | static void *l2cap_seq_start(struct seq_file *seq, loff_t *pos) | ||
2143 | { | 2140 | { |
2144 | struct sock *sk; | 2141 | struct sock *sk; |
2145 | struct hlist_node *node; | 2142 | struct hlist_node *node; |
2146 | loff_t l = *pos; | 2143 | char *str = buf; |
2147 | 2144 | ||
2148 | read_lock_bh(&l2cap_sk_list.lock); | 2145 | read_lock_bh(&l2cap_sk_list.lock); |
2149 | 2146 | ||
2150 | sk_for_each(sk, node, &l2cap_sk_list.head) | 2147 | sk_for_each(sk, node, &l2cap_sk_list.head) { |
2151 | if (!l--) | 2148 | struct l2cap_pinfo *pi = l2cap_pi(sk); |
2152 | goto found; | ||
2153 | sk = NULL; | ||
2154 | found: | ||
2155 | return sk; | ||
2156 | } | ||
2157 | 2149 | ||
2158 | static void *l2cap_seq_next(struct seq_file *seq, void *e, loff_t *pos) | 2150 | str += sprintf(str, "%s %s %d %d 0x%4.4x 0x%4.4x %d %d 0x%x\n", |
2159 | { | 2151 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), |
2160 | (*pos)++; | 2152 | sk->sk_state, pi->psm, pi->scid, pi->dcid, pi->imtu, |
2161 | return sk_next(e); | 2153 | pi->omtu, pi->link_mode); |
2162 | } | 2154 | } |
2163 | 2155 | ||
2164 | static void l2cap_seq_stop(struct seq_file *seq, void *e) | ||
2165 | { | ||
2166 | read_unlock_bh(&l2cap_sk_list.lock); | 2156 | read_unlock_bh(&l2cap_sk_list.lock); |
2167 | } | ||
2168 | 2157 | ||
2169 | static int l2cap_seq_show(struct seq_file *seq, void *e) | 2158 | return (str - buf); |
2170 | { | ||
2171 | struct sock *sk = e; | ||
2172 | struct l2cap_pinfo *pi = l2cap_pi(sk); | ||
2173 | |||
2174 | seq_printf(seq, "%s %s %d %d 0x%4.4x 0x%4.4x %d %d 0x%x\n", | ||
2175 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), | ||
2176 | sk->sk_state, pi->psm, pi->scid, pi->dcid, pi->imtu, | ||
2177 | pi->omtu, pi->link_mode); | ||
2178 | return 0; | ||
2179 | } | 2159 | } |
2180 | 2160 | ||
2181 | static struct seq_operations l2cap_seq_ops = { | 2161 | static CLASS_ATTR(l2cap, S_IRUGO, l2cap_sysfs_show, NULL); |
2182 | .start = l2cap_seq_start, | ||
2183 | .next = l2cap_seq_next, | ||
2184 | .stop = l2cap_seq_stop, | ||
2185 | .show = l2cap_seq_show | ||
2186 | }; | ||
2187 | |||
2188 | static int l2cap_seq_open(struct inode *inode, struct file *file) | ||
2189 | { | ||
2190 | return seq_open(file, &l2cap_seq_ops); | ||
2191 | } | ||
2192 | |||
2193 | static struct file_operations l2cap_seq_fops = { | ||
2194 | .owner = THIS_MODULE, | ||
2195 | .open = l2cap_seq_open, | ||
2196 | .read = seq_read, | ||
2197 | .llseek = seq_lseek, | ||
2198 | .release = seq_release, | ||
2199 | }; | ||
2200 | |||
2201 | static int __init l2cap_proc_init(void) | ||
2202 | { | ||
2203 | struct proc_dir_entry *p = create_proc_entry("l2cap", S_IRUGO, proc_bt); | ||
2204 | if (!p) | ||
2205 | return -ENOMEM; | ||
2206 | p->owner = THIS_MODULE; | ||
2207 | p->proc_fops = &l2cap_seq_fops; | ||
2208 | return 0; | ||
2209 | } | ||
2210 | |||
2211 | static void __exit l2cap_proc_cleanup(void) | ||
2212 | { | ||
2213 | remove_proc_entry("l2cap", proc_bt); | ||
2214 | } | ||
2215 | |||
2216 | #else /* CONFIG_PROC_FS */ | ||
2217 | |||
2218 | static int __init l2cap_proc_init(void) | ||
2219 | { | ||
2220 | return 0; | ||
2221 | } | ||
2222 | |||
2223 | static void __exit l2cap_proc_cleanup(void) | ||
2224 | { | ||
2225 | return; | ||
2226 | } | ||
2227 | #endif /* CONFIG_PROC_FS */ | ||
2228 | 2162 | ||
2229 | static struct proto_ops l2cap_sock_ops = { | 2163 | static struct proto_ops l2cap_sock_ops = { |
2230 | .family = PF_BLUETOOTH, | 2164 | .family = PF_BLUETOOTH, |
@@ -2266,7 +2200,7 @@ static struct hci_proto l2cap_hci_proto = { | |||
2266 | static int __init l2cap_init(void) | 2200 | static int __init l2cap_init(void) |
2267 | { | 2201 | { |
2268 | int err; | 2202 | int err; |
2269 | 2203 | ||
2270 | err = proto_register(&l2cap_proto, 0); | 2204 | err = proto_register(&l2cap_proto, 0); |
2271 | if (err < 0) | 2205 | if (err < 0) |
2272 | return err; | 2206 | return err; |
@@ -2284,7 +2218,7 @@ static int __init l2cap_init(void) | |||
2284 | goto error; | 2218 | goto error; |
2285 | } | 2219 | } |
2286 | 2220 | ||
2287 | l2cap_proc_init(); | 2221 | class_create_file(&bt_class, &class_attr_l2cap); |
2288 | 2222 | ||
2289 | BT_INFO("L2CAP ver %s", VERSION); | 2223 | BT_INFO("L2CAP ver %s", VERSION); |
2290 | BT_INFO("L2CAP socket layer initialized"); | 2224 | BT_INFO("L2CAP socket layer initialized"); |
@@ -2298,7 +2232,7 @@ error: | |||
2298 | 2232 | ||
2299 | static void __exit l2cap_exit(void) | 2233 | static void __exit l2cap_exit(void) |
2300 | { | 2234 | { |
2301 | l2cap_proc_cleanup(); | 2235 | class_remove_file(&bt_class, &class_attr_l2cap); |
2302 | 2236 | ||
2303 | if (bt_sock_unregister(BTPROTO_L2CAP) < 0) | 2237 | if (bt_sock_unregister(BTPROTO_L2CAP) < 0) |
2304 | BT_ERR("L2CAP socket unregistration failed"); | 2238 | BT_ERR("L2CAP socket unregistration failed"); |
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index c3d56ead840c..0d89d6434136 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
@@ -35,9 +35,8 @@ | |||
35 | #include <linux/signal.h> | 35 | #include <linux/signal.h> |
36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
37 | #include <linux/wait.h> | 37 | #include <linux/wait.h> |
38 | #include <linux/device.h> | ||
38 | #include <linux/net.h> | 39 | #include <linux/net.h> |
39 | #include <linux/proc_fs.h> | ||
40 | #include <linux/seq_file.h> | ||
41 | #include <net/sock.h> | 40 | #include <net/sock.h> |
42 | #include <asm/uaccess.h> | 41 | #include <asm/uaccess.h> |
43 | #include <asm/unaligned.h> | 42 | #include <asm/unaligned.h> |
@@ -47,17 +46,13 @@ | |||
47 | #include <net/bluetooth/l2cap.h> | 46 | #include <net/bluetooth/l2cap.h> |
48 | #include <net/bluetooth/rfcomm.h> | 47 | #include <net/bluetooth/rfcomm.h> |
49 | 48 | ||
50 | #define VERSION "1.5" | 49 | #define VERSION "1.6" |
51 | 50 | ||
52 | #ifndef CONFIG_BT_RFCOMM_DEBUG | 51 | #ifndef CONFIG_BT_RFCOMM_DEBUG |
53 | #undef BT_DBG | 52 | #undef BT_DBG |
54 | #define BT_DBG(D...) | 53 | #define BT_DBG(D...) |
55 | #endif | 54 | #endif |
56 | 55 | ||
57 | #ifdef CONFIG_PROC_FS | ||
58 | struct proc_dir_entry *proc_bt_rfcomm; | ||
59 | #endif | ||
60 | |||
61 | static struct task_struct *rfcomm_thread; | 56 | static struct task_struct *rfcomm_thread; |
62 | 57 | ||
63 | static DECLARE_MUTEX(rfcomm_sem); | 58 | static DECLARE_MUTEX(rfcomm_sem); |
@@ -2001,117 +1996,32 @@ static struct hci_cb rfcomm_cb = { | |||
2001 | .encrypt_cfm = rfcomm_encrypt_cfm | 1996 | .encrypt_cfm = rfcomm_encrypt_cfm |
2002 | }; | 1997 | }; |
2003 | 1998 | ||
2004 | /* ---- Proc fs support ---- */ | 1999 | static ssize_t rfcomm_dlc_sysfs_show(struct class *dev, char *buf) |
2005 | #ifdef CONFIG_PROC_FS | ||
2006 | static void *rfcomm_seq_start(struct seq_file *seq, loff_t *pos) | ||
2007 | { | 2000 | { |
2008 | struct rfcomm_session *s; | 2001 | struct rfcomm_session *s; |
2009 | struct list_head *pp, *p; | 2002 | struct list_head *pp, *p; |
2010 | loff_t l = *pos; | 2003 | char *str = buf; |
2011 | 2004 | ||
2012 | rfcomm_lock(); | 2005 | rfcomm_lock(); |
2013 | 2006 | ||
2014 | list_for_each(p, &session_list) { | 2007 | list_for_each(p, &session_list) { |
2015 | s = list_entry(p, struct rfcomm_session, list); | 2008 | s = list_entry(p, struct rfcomm_session, list); |
2016 | list_for_each(pp, &s->dlcs) | 2009 | list_for_each(pp, &s->dlcs) { |
2017 | if (!l--) { | 2010 | struct sock *sk = s->sock->sk; |
2018 | seq->private = s; | 2011 | struct rfcomm_dlc *d = list_entry(pp, struct rfcomm_dlc, list); |
2019 | return pp; | ||
2020 | } | ||
2021 | } | ||
2022 | return NULL; | ||
2023 | } | ||
2024 | 2012 | ||
2025 | static void *rfcomm_seq_next(struct seq_file *seq, void *e, loff_t *pos) | 2013 | str += sprintf(str, "%s %s %ld %d %d %d %d\n", |
2026 | { | 2014 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), |
2027 | struct rfcomm_session *s = seq->private; | 2015 | d->state, d->dlci, d->mtu, d->rx_credits, d->tx_credits); |
2028 | struct list_head *pp, *p = e; | ||
2029 | (*pos)++; | ||
2030 | |||
2031 | if (p->next != &s->dlcs) | ||
2032 | return p->next; | ||
2033 | |||
2034 | list_for_each(p, &session_list) { | ||
2035 | s = list_entry(p, struct rfcomm_session, list); | ||
2036 | __list_for_each(pp, &s->dlcs) { | ||
2037 | seq->private = s; | ||
2038 | return pp; | ||
2039 | } | 2016 | } |
2040 | } | 2017 | } |
2041 | return NULL; | ||
2042 | } | ||
2043 | 2018 | ||
2044 | static void rfcomm_seq_stop(struct seq_file *seq, void *e) | ||
2045 | { | ||
2046 | rfcomm_unlock(); | 2019 | rfcomm_unlock(); |
2047 | } | ||
2048 | |||
2049 | static int rfcomm_seq_show(struct seq_file *seq, void *e) | ||
2050 | { | ||
2051 | struct rfcomm_session *s = seq->private; | ||
2052 | struct sock *sk = s->sock->sk; | ||
2053 | struct rfcomm_dlc *d = list_entry(e, struct rfcomm_dlc, list); | ||
2054 | |||
2055 | seq_printf(seq, "%s %s %ld %d %d %d %d\n", | ||
2056 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), | ||
2057 | d->state, d->dlci, d->mtu, d->rx_credits, d->tx_credits); | ||
2058 | return 0; | ||
2059 | } | ||
2060 | |||
2061 | static struct seq_operations rfcomm_seq_ops = { | ||
2062 | .start = rfcomm_seq_start, | ||
2063 | .next = rfcomm_seq_next, | ||
2064 | .stop = rfcomm_seq_stop, | ||
2065 | .show = rfcomm_seq_show | ||
2066 | }; | ||
2067 | |||
2068 | static int rfcomm_seq_open(struct inode *inode, struct file *file) | ||
2069 | { | ||
2070 | return seq_open(file, &rfcomm_seq_ops); | ||
2071 | } | ||
2072 | |||
2073 | static struct file_operations rfcomm_seq_fops = { | ||
2074 | .owner = THIS_MODULE, | ||
2075 | .open = rfcomm_seq_open, | ||
2076 | .read = seq_read, | ||
2077 | .llseek = seq_lseek, | ||
2078 | .release = seq_release, | ||
2079 | }; | ||
2080 | |||
2081 | static int __init rfcomm_proc_init(void) | ||
2082 | { | ||
2083 | struct proc_dir_entry *p; | ||
2084 | |||
2085 | proc_bt_rfcomm = proc_mkdir("rfcomm", proc_bt); | ||
2086 | if (proc_bt_rfcomm) { | ||
2087 | proc_bt_rfcomm->owner = THIS_MODULE; | ||
2088 | |||
2089 | p = create_proc_entry("dlc", S_IRUGO, proc_bt_rfcomm); | ||
2090 | if (p) | ||
2091 | p->proc_fops = &rfcomm_seq_fops; | ||
2092 | } | ||
2093 | return 0; | ||
2094 | } | ||
2095 | |||
2096 | static void __exit rfcomm_proc_cleanup(void) | ||
2097 | { | ||
2098 | remove_proc_entry("dlc", proc_bt_rfcomm); | ||
2099 | 2020 | ||
2100 | remove_proc_entry("rfcomm", proc_bt); | 2021 | return (str - buf); |
2101 | } | 2022 | } |
2102 | 2023 | ||
2103 | #else /* CONFIG_PROC_FS */ | 2024 | static CLASS_ATTR(rfcomm_dlc, S_IRUGO, rfcomm_dlc_sysfs_show, NULL); |
2104 | |||
2105 | static int __init rfcomm_proc_init(void) | ||
2106 | { | ||
2107 | return 0; | ||
2108 | } | ||
2109 | |||
2110 | static void __exit rfcomm_proc_cleanup(void) | ||
2111 | { | ||
2112 | return; | ||
2113 | } | ||
2114 | #endif /* CONFIG_PROC_FS */ | ||
2115 | 2025 | ||
2116 | /* ---- Initialization ---- */ | 2026 | /* ---- Initialization ---- */ |
2117 | static int __init rfcomm_init(void) | 2027 | static int __init rfcomm_init(void) |
@@ -2122,9 +2032,7 @@ static int __init rfcomm_init(void) | |||
2122 | 2032 | ||
2123 | kernel_thread(rfcomm_run, NULL, CLONE_KERNEL); | 2033 | kernel_thread(rfcomm_run, NULL, CLONE_KERNEL); |
2124 | 2034 | ||
2125 | BT_INFO("RFCOMM ver %s", VERSION); | 2035 | class_create_file(&bt_class, &class_attr_rfcomm_dlc); |
2126 | |||
2127 | rfcomm_proc_init(); | ||
2128 | 2036 | ||
2129 | rfcomm_init_sockets(); | 2037 | rfcomm_init_sockets(); |
2130 | 2038 | ||
@@ -2132,11 +2040,15 @@ static int __init rfcomm_init(void) | |||
2132 | rfcomm_init_ttys(); | 2040 | rfcomm_init_ttys(); |
2133 | #endif | 2041 | #endif |
2134 | 2042 | ||
2043 | BT_INFO("RFCOMM ver %s", VERSION); | ||
2044 | |||
2135 | return 0; | 2045 | return 0; |
2136 | } | 2046 | } |
2137 | 2047 | ||
2138 | static void __exit rfcomm_exit(void) | 2048 | static void __exit rfcomm_exit(void) |
2139 | { | 2049 | { |
2050 | class_remove_file(&bt_class, &class_attr_rfcomm_dlc); | ||
2051 | |||
2140 | hci_unregister_cb(&rfcomm_cb); | 2052 | hci_unregister_cb(&rfcomm_cb); |
2141 | 2053 | ||
2142 | /* Terminate working thread. | 2054 | /* Terminate working thread. |
@@ -2153,8 +2065,6 @@ static void __exit rfcomm_exit(void) | |||
2153 | #endif | 2065 | #endif |
2154 | 2066 | ||
2155 | rfcomm_cleanup_sockets(); | 2067 | rfcomm_cleanup_sockets(); |
2156 | |||
2157 | rfcomm_proc_cleanup(); | ||
2158 | } | 2068 | } |
2159 | 2069 | ||
2160 | module_init(rfcomm_init); | 2070 | module_init(rfcomm_init); |
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index a2b30f0aedb7..6c34261b232e 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -42,8 +42,7 @@ | |||
42 | #include <linux/socket.h> | 42 | #include <linux/socket.h> |
43 | #include <linux/skbuff.h> | 43 | #include <linux/skbuff.h> |
44 | #include <linux/list.h> | 44 | #include <linux/list.h> |
45 | #include <linux/proc_fs.h> | 45 | #include <linux/device.h> |
46 | #include <linux/seq_file.h> | ||
47 | #include <net/sock.h> | 46 | #include <net/sock.h> |
48 | 47 | ||
49 | #include <asm/system.h> | 48 | #include <asm/system.h> |
@@ -887,89 +886,26 @@ done: | |||
887 | return result; | 886 | return result; |
888 | } | 887 | } |
889 | 888 | ||
890 | /* ---- Proc fs support ---- */ | 889 | static ssize_t rfcomm_sock_sysfs_show(struct class *dev, char *buf) |
891 | #ifdef CONFIG_PROC_FS | ||
892 | static void *rfcomm_seq_start(struct seq_file *seq, loff_t *pos) | ||
893 | { | 890 | { |
894 | struct sock *sk; | 891 | struct sock *sk; |
895 | struct hlist_node *node; | 892 | struct hlist_node *node; |
896 | loff_t l = *pos; | 893 | char *str = buf; |
897 | 894 | ||
898 | read_lock_bh(&rfcomm_sk_list.lock); | 895 | read_lock_bh(&rfcomm_sk_list.lock); |
899 | 896 | ||
900 | sk_for_each(sk, node, &rfcomm_sk_list.head) | 897 | sk_for_each(sk, node, &rfcomm_sk_list.head) { |
901 | if (!l--) | 898 | str += sprintf(str, "%s %s %d %d\n", |
902 | return sk; | 899 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), |
903 | return NULL; | 900 | sk->sk_state, rfcomm_pi(sk)->channel); |
904 | } | 901 | } |
905 | |||
906 | static void *rfcomm_seq_next(struct seq_file *seq, void *e, loff_t *pos) | ||
907 | { | ||
908 | struct sock *sk = e; | ||
909 | (*pos)++; | ||
910 | return sk_next(sk); | ||
911 | } | ||
912 | 902 | ||
913 | static void rfcomm_seq_stop(struct seq_file *seq, void *e) | ||
914 | { | ||
915 | read_unlock_bh(&rfcomm_sk_list.lock); | 903 | read_unlock_bh(&rfcomm_sk_list.lock); |
916 | } | ||
917 | 904 | ||
918 | static int rfcomm_seq_show(struct seq_file *seq, void *e) | 905 | return (str - buf); |
919 | { | ||
920 | struct sock *sk = e; | ||
921 | seq_printf(seq, "%s %s %d %d\n", | ||
922 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), | ||
923 | sk->sk_state, rfcomm_pi(sk)->channel); | ||
924 | return 0; | ||
925 | } | ||
926 | |||
927 | static struct seq_operations rfcomm_seq_ops = { | ||
928 | .start = rfcomm_seq_start, | ||
929 | .next = rfcomm_seq_next, | ||
930 | .stop = rfcomm_seq_stop, | ||
931 | .show = rfcomm_seq_show | ||
932 | }; | ||
933 | |||
934 | static int rfcomm_seq_open(struct inode *inode, struct file *file) | ||
935 | { | ||
936 | return seq_open(file, &rfcomm_seq_ops); | ||
937 | } | 906 | } |
938 | 907 | ||
939 | static struct file_operations rfcomm_seq_fops = { | 908 | static CLASS_ATTR(rfcomm, S_IRUGO, rfcomm_sock_sysfs_show, NULL); |
940 | .owner = THIS_MODULE, | ||
941 | .open = rfcomm_seq_open, | ||
942 | .read = seq_read, | ||
943 | .llseek = seq_lseek, | ||
944 | .release = seq_release, | ||
945 | }; | ||
946 | |||
947 | static int __init rfcomm_sock_proc_init(void) | ||
948 | { | ||
949 | struct proc_dir_entry *p = create_proc_entry("sock", S_IRUGO, proc_bt_rfcomm); | ||
950 | if (!p) | ||
951 | return -ENOMEM; | ||
952 | p->proc_fops = &rfcomm_seq_fops; | ||
953 | return 0; | ||
954 | } | ||
955 | |||
956 | static void __exit rfcomm_sock_proc_cleanup(void) | ||
957 | { | ||
958 | remove_proc_entry("sock", proc_bt_rfcomm); | ||
959 | } | ||
960 | |||
961 | #else /* CONFIG_PROC_FS */ | ||
962 | |||
963 | static int __init rfcomm_sock_proc_init(void) | ||
964 | { | ||
965 | return 0; | ||
966 | } | ||
967 | |||
968 | static void __exit rfcomm_sock_proc_cleanup(void) | ||
969 | { | ||
970 | return; | ||
971 | } | ||
972 | #endif /* CONFIG_PROC_FS */ | ||
973 | 909 | ||
974 | static struct proto_ops rfcomm_sock_ops = { | 910 | static struct proto_ops rfcomm_sock_ops = { |
975 | .family = PF_BLUETOOTH, | 911 | .family = PF_BLUETOOTH, |
@@ -997,7 +933,7 @@ static struct net_proto_family rfcomm_sock_family_ops = { | |||
997 | .create = rfcomm_sock_create | 933 | .create = rfcomm_sock_create |
998 | }; | 934 | }; |
999 | 935 | ||
1000 | int __init rfcomm_init_sockets(void) | 936 | int __init rfcomm_init_sockets(void) |
1001 | { | 937 | { |
1002 | int err; | 938 | int err; |
1003 | 939 | ||
@@ -1009,7 +945,7 @@ int __init rfcomm_init_sockets(void) | |||
1009 | if (err < 0) | 945 | if (err < 0) |
1010 | goto error; | 946 | goto error; |
1011 | 947 | ||
1012 | rfcomm_sock_proc_init(); | 948 | class_create_file(&bt_class, &class_attr_rfcomm); |
1013 | 949 | ||
1014 | BT_INFO("RFCOMM socket layer initialized"); | 950 | BT_INFO("RFCOMM socket layer initialized"); |
1015 | 951 | ||
@@ -1023,7 +959,7 @@ error: | |||
1023 | 959 | ||
1024 | void __exit rfcomm_cleanup_sockets(void) | 960 | void __exit rfcomm_cleanup_sockets(void) |
1025 | { | 961 | { |
1026 | rfcomm_sock_proc_cleanup(); | 962 | class_remove_file(&bt_class, &class_attr_rfcomm); |
1027 | 963 | ||
1028 | if (bt_sock_unregister(BTPROTO_RFCOMM) < 0) | 964 | if (bt_sock_unregister(BTPROTO_RFCOMM) < 0) |
1029 | BT_ERR("RFCOMM socket layer unregistration failed"); | 965 | BT_ERR("RFCOMM socket layer unregistration failed"); |
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 997e42df115c..9cb00dc6c08c 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c | |||
@@ -38,8 +38,7 @@ | |||
38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
39 | #include <linux/socket.h> | 39 | #include <linux/socket.h> |
40 | #include <linux/skbuff.h> | 40 | #include <linux/skbuff.h> |
41 | #include <linux/proc_fs.h> | 41 | #include <linux/device.h> |
42 | #include <linux/seq_file.h> | ||
43 | #include <linux/list.h> | 42 | #include <linux/list.h> |
44 | #include <net/sock.h> | 43 | #include <net/sock.h> |
45 | 44 | ||
@@ -55,7 +54,7 @@ | |||
55 | #define BT_DBG(D...) | 54 | #define BT_DBG(D...) |
56 | #endif | 55 | #endif |
57 | 56 | ||
58 | #define VERSION "0.4" | 57 | #define VERSION "0.5" |
59 | 58 | ||
60 | static struct proto_ops sco_sock_ops; | 59 | static struct proto_ops sco_sock_ops; |
61 | 60 | ||
@@ -893,91 +892,26 @@ drop: | |||
893 | return 0; | 892 | return 0; |
894 | } | 893 | } |
895 | 894 | ||
896 | /* ---- Proc fs support ---- */ | 895 | static ssize_t sco_sysfs_show(struct class *dev, char *buf) |
897 | #ifdef CONFIG_PROC_FS | ||
898 | static void *sco_seq_start(struct seq_file *seq, loff_t *pos) | ||
899 | { | 896 | { |
900 | struct sock *sk; | 897 | struct sock *sk; |
901 | struct hlist_node *node; | 898 | struct hlist_node *node; |
902 | loff_t l = *pos; | 899 | char *str = buf; |
903 | 900 | ||
904 | read_lock_bh(&sco_sk_list.lock); | 901 | read_lock_bh(&sco_sk_list.lock); |
905 | 902 | ||
906 | sk_for_each(sk, node, &sco_sk_list.head) | 903 | sk_for_each(sk, node, &sco_sk_list.head) { |
907 | if (!l--) | 904 | str += sprintf(str, "%s %s %d\n", |
908 | goto found; | 905 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), |
909 | sk = NULL; | 906 | sk->sk_state); |
910 | found: | 907 | } |
911 | return sk; | ||
912 | } | ||
913 | |||
914 | static void *sco_seq_next(struct seq_file *seq, void *e, loff_t *pos) | ||
915 | { | ||
916 | struct sock *sk = e; | ||
917 | (*pos)++; | ||
918 | return sk_next(sk); | ||
919 | } | ||
920 | 908 | ||
921 | static void sco_seq_stop(struct seq_file *seq, void *e) | ||
922 | { | ||
923 | read_unlock_bh(&sco_sk_list.lock); | 909 | read_unlock_bh(&sco_sk_list.lock); |
924 | } | ||
925 | |||
926 | static int sco_seq_show(struct seq_file *seq, void *e) | ||
927 | { | ||
928 | struct sock *sk = e; | ||
929 | seq_printf(seq, "%s %s %d\n", | ||
930 | batostr(&bt_sk(sk)->src), batostr(&bt_sk(sk)->dst), sk->sk_state); | ||
931 | return 0; | ||
932 | } | ||
933 | 910 | ||
934 | static struct seq_operations sco_seq_ops = { | 911 | return (str - buf); |
935 | .start = sco_seq_start, | ||
936 | .next = sco_seq_next, | ||
937 | .stop = sco_seq_stop, | ||
938 | .show = sco_seq_show | ||
939 | }; | ||
940 | |||
941 | static int sco_seq_open(struct inode *inode, struct file *file) | ||
942 | { | ||
943 | return seq_open(file, &sco_seq_ops); | ||
944 | } | 912 | } |
945 | 913 | ||
946 | static struct file_operations sco_seq_fops = { | 914 | static CLASS_ATTR(sco, S_IRUGO, sco_sysfs_show, NULL); |
947 | .owner = THIS_MODULE, | ||
948 | .open = sco_seq_open, | ||
949 | .read = seq_read, | ||
950 | .llseek = seq_lseek, | ||
951 | .release = seq_release, | ||
952 | }; | ||
953 | |||
954 | static int __init sco_proc_init(void) | ||
955 | { | ||
956 | struct proc_dir_entry *p = create_proc_entry("sco", S_IRUGO, proc_bt); | ||
957 | if (!p) | ||
958 | return -ENOMEM; | ||
959 | p->owner = THIS_MODULE; | ||
960 | p->proc_fops = &sco_seq_fops; | ||
961 | return 0; | ||
962 | } | ||
963 | |||
964 | static void __exit sco_proc_cleanup(void) | ||
965 | { | ||
966 | remove_proc_entry("sco", proc_bt); | ||
967 | } | ||
968 | |||
969 | #else /* CONFIG_PROC_FS */ | ||
970 | |||
971 | static int __init sco_proc_init(void) | ||
972 | { | ||
973 | return 0; | ||
974 | } | ||
975 | |||
976 | static void __exit sco_proc_cleanup(void) | ||
977 | { | ||
978 | return; | ||
979 | } | ||
980 | #endif /* CONFIG_PROC_FS */ | ||
981 | 915 | ||
982 | static struct proto_ops sco_sock_ops = { | 916 | static struct proto_ops sco_sock_ops = { |
983 | .family = PF_BLUETOOTH, | 917 | .family = PF_BLUETOOTH, |
@@ -1035,7 +969,7 @@ static int __init sco_init(void) | |||
1035 | goto error; | 969 | goto error; |
1036 | } | 970 | } |
1037 | 971 | ||
1038 | sco_proc_init(); | 972 | class_create_file(&bt_class, &class_attr_sco); |
1039 | 973 | ||
1040 | BT_INFO("SCO (Voice Link) ver %s", VERSION); | 974 | BT_INFO("SCO (Voice Link) ver %s", VERSION); |
1041 | BT_INFO("SCO socket layer initialized"); | 975 | BT_INFO("SCO socket layer initialized"); |
@@ -1049,7 +983,7 @@ error: | |||
1049 | 983 | ||
1050 | static void __exit sco_exit(void) | 984 | static void __exit sco_exit(void) |
1051 | { | 985 | { |
1052 | sco_proc_cleanup(); | 986 | class_remove_file(&bt_class, &class_attr_sco); |
1053 | 987 | ||
1054 | if (bt_sock_unregister(BTPROTO_SCO) < 0) | 988 | if (bt_sock_unregister(BTPROTO_SCO) < 0) |
1055 | BT_ERR("SCO socket unregistration failed"); | 989 | BT_ERR("SCO socket unregistration failed"); |