This patch contains the following possible cleanups:
- #ifdef HCI_DATA_DUMP the following function:
lib.c: bt_dump
- #if 0 the following unused global functions:
- hci_core.c: hci_suspend_dev
- hci_core.c: hci_resume_dev
- remove the following unneeded EXPORT_SYMBOL's:
- hci_core.c: hci_dev_get
- hci_core.c: hci_send_cmd
- hci_event.c: hci_si_event
Please review which of these changes do make sense and which conflict
with pending patches.
Signed-off-by: Adrian Bunk <[email protected]>
---
include/net/bluetooth/hci_core.h | 2 --
net/bluetooth/hci_core.c | 6 ++++--
net/bluetooth/hci_event.c | 1 -
net/bluetooth/lib.c | 2 ++
4 files changed, 6 insertions(+), 5 deletions(-)
--- linux-2.6.12-rc3-mm2-full/include/net/bluetooth/hci_core.h.old 2005-05-03 10:38:41.000000000 +0200
+++ linux-2.6.12-rc3-mm2-full/include/net/bluetooth/hci_core.h 2005-05-03 10:38:49.000000000 +0200
@@ -375,8 +375,6 @@
void hci_free_dev(struct hci_dev *hdev);
int hci_register_dev(struct hci_dev *hdev);
int hci_unregister_dev(struct hci_dev *hdev);
-int hci_suspend_dev(struct hci_dev *hdev);
-int hci_resume_dev(struct hci_dev *hdev);
int hci_dev_open(__u16 dev);
int hci_dev_close(__u16 dev);
int hci_dev_reset(__u16 dev);
--- linux-2.6.12-rc3-mm2-full/net/bluetooth/hci_core.c.old 2005-05-03 10:38:58.000000000 +0200
+++ linux-2.6.12-rc3-mm2-full/net/bluetooth/hci_core.c 2005-05-03 10:47:49.000000000 +0200
@@ -299,7 +299,6 @@
read_unlock(&hci_dev_list_lock);
return hdev;
}
-EXPORT_SYMBOL(hci_dev_get);
/* ---- Inquiry support ---- */
static void inquiry_cache_flush(struct hci_dev *hdev)
@@ -899,6 +898,8 @@
}
EXPORT_SYMBOL(hci_unregister_dev);
+#if 0
+
/* Suspend HCI device */
int hci_suspend_dev(struct hci_dev *hdev)
{
@@ -915,6 +916,8 @@
}
EXPORT_SYMBOL(hci_resume_dev);
+#endif /* 0 */
+
/* ---- Interface to upper protocols ---- */
/* Register/Unregister protocols.
@@ -1042,7 +1045,6 @@
return 0;
}
-EXPORT_SYMBOL(hci_send_cmd);
/* Get data from the previously sent command */
void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 ogf, __u16 ocf)
--- linux-2.6.12-rc3-mm2-full/net/bluetooth/lib.c.old 2005-05-03 10:39:29.000000000 +0200
+++ linux-2.6.12-rc3-mm2-full/net/bluetooth/lib.c 2005-05-03 10:39:49.000000000 +0200
@@ -34,6 +34,7 @@
#include <net/bluetooth/bluetooth.h>
+#ifdef HCI_DATA_DUMP
void bt_dump(char *pref, __u8 *buf, int count)
{
char *ptr;
@@ -58,6 +59,7 @@
printk(KERN_INFO "%s:%s\n", pref, line);
}
EXPORT_SYMBOL(bt_dump);
+#endif /* HCI_DATA_DUMP */
void baswap(bdaddr_t *dst, bdaddr_t *src)
{
--- linux-2.6.12-rc3-mm2-full/net/bluetooth/hci_event.c.old 2005-05-03 10:48:13.000000000 +0200
+++ linux-2.6.12-rc3-mm2-full/net/bluetooth/hci_event.c 2005-05-03 10:48:21.000000000 +0200
@@ -1040,4 +1040,3 @@
hci_send_to_sock(hdev, skb);
kfree_skb(skb);
}
-EXPORT_SYMBOL(hci_si_event);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
