Commit 66e8b6c3 authored by Marcel Holtmann's avatar Marcel Holtmann

[Bluetooth] Remove unused functions and cleanup symbol exports

This patch removes the unused bt_dump() function and it also removes
its BT_DMP macro. It also unexports the hci_dev_get(), hci_send_cmd()
and hci_si_event() functions.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e9a3e671
...@@ -58,8 +58,6 @@ ...@@ -58,8 +58,6 @@
#ifndef CONFIG_BT_HCIUART_DEBUG #ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG #undef BT_DBG
#define BT_DBG( A... ) #define BT_DBG( A... )
#undef BT_DMP
#define BT_DMP( A... )
#endif #endif
static int hciextn = 1; static int hciextn = 1;
......
...@@ -57,8 +57,6 @@ ...@@ -57,8 +57,6 @@
#ifndef CONFIG_BT_HCIUART_DEBUG #ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG #undef BT_DBG
#define BT_DBG( A... ) #define BT_DBG( A... )
#undef BT_DMP
#define BT_DMP( A... )
#endif #endif
/* Initialize protocol */ /* Initialize protocol */
...@@ -125,7 +123,6 @@ static inline int h4_check_data_len(struct h4_struct *h4, int len) ...@@ -125,7 +123,6 @@ static inline int h4_check_data_len(struct h4_struct *h4, int len)
BT_DBG("len %d room %d", len, room); BT_DBG("len %d room %d", len, room);
if (!len) { if (!len) {
BT_DMP(h4->rx_skb->data, h4->rx_skb->len);
hci_recv_frame(h4->rx_skb); hci_recv_frame(h4->rx_skb);
} else if (len > room) { } else if (len > room) {
BT_ERR("Data length is too large"); BT_ERR("Data length is too large");
...@@ -169,8 +166,6 @@ static int h4_recv(struct hci_uart *hu, void *data, int count) ...@@ -169,8 +166,6 @@ static int h4_recv(struct hci_uart *hu, void *data, int count)
case H4_W4_DATA: case H4_W4_DATA:
BT_DBG("Complete data"); BT_DBG("Complete data");
BT_DMP(h4->rx_skb->data, h4->rx_skb->len);
hci_recv_frame(h4->rx_skb); hci_recv_frame(h4->rx_skb);
h4->rx_state = H4_W4_PACKET_TYPE; h4->rx_state = H4_W4_PACKET_TYPE;
......
...@@ -57,8 +57,6 @@ ...@@ -57,8 +57,6 @@
#ifndef CONFIG_BT_HCIUART_DEBUG #ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG #undef BT_DBG
#define BT_DBG( A... ) #define BT_DBG( A... )
#undef BT_DMP
#define BT_DMP( A... )
#endif #endif
static int reset = 0; static int reset = 0;
......
...@@ -57,8 +57,6 @@ ...@@ -57,8 +57,6 @@
#ifndef CONFIG_BT_HCIUSB_DEBUG #ifndef CONFIG_BT_HCIUSB_DEBUG
#undef BT_DBG #undef BT_DBG
#define BT_DBG(D...) #define BT_DBG(D...)
#undef BT_DMP
#define BT_DMP(D...)
#endif #endif
#ifndef CONFIG_BT_HCIUSB_ZERO_PACKET #ifndef CONFIG_BT_HCIUSB_ZERO_PACKET
......
...@@ -57,12 +57,6 @@ ...@@ -57,12 +57,6 @@
#define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FUNCTION__ , ## arg) #define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FUNCTION__ , ## arg)
#define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FUNCTION__ , ## arg) #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FUNCTION__ , ## arg)
#ifdef HCI_DATA_DUMP
#define BT_DMP(buf, len) bt_dump(__FUNCTION__, buf, len)
#else
#define BT_DMP(D...)
#endif
extern struct proc_dir_entry *proc_bt; extern struct proc_dir_entry *proc_bt;
/* Connection and socket states */ /* Connection and socket states */
...@@ -174,8 +168,6 @@ static inline int skb_frags_no(struct sk_buff *skb) ...@@ -174,8 +168,6 @@ static inline int skb_frags_no(struct sk_buff *skb)
return n; return n;
} }
void bt_dump(char *pref, __u8 *buf, int count);
int bt_err(__u16 code); int bt_err(__u16 code);
#endif /* __BLUETOOTH_H */ #endif /* __BLUETOOTH_H */
...@@ -299,7 +299,6 @@ struct hci_dev *hci_dev_get(int index) ...@@ -299,7 +299,6 @@ struct hci_dev *hci_dev_get(int index)
read_unlock(&hci_dev_list_lock); read_unlock(&hci_dev_list_lock);
return hdev; return hdev;
} }
EXPORT_SYMBOL(hci_dev_get);
/* ---- Inquiry support ---- */ /* ---- Inquiry support ---- */
static void inquiry_cache_flush(struct hci_dev *hdev) static void inquiry_cache_flush(struct hci_dev *hdev)
...@@ -1042,7 +1041,6 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 ogf, __u16 ocf, __u32 plen, void *p ...@@ -1042,7 +1041,6 @@ int hci_send_cmd(struct hci_dev *hdev, __u16 ogf, __u16 ocf, __u32 plen, void *p
return 0; return 0;
} }
EXPORT_SYMBOL(hci_send_cmd);
/* Get data from the previously sent command */ /* Get data from the previously sent command */
void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 ogf, __u16 ocf) void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 ogf, __u16 ocf)
......
...@@ -1040,4 +1040,3 @@ void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data) ...@@ -1040,4 +1040,3 @@ void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data)
hci_send_to_sock(hdev, skb); hci_send_to_sock(hdev, skb);
kfree_skb(skb); kfree_skb(skb);
} }
EXPORT_SYMBOL(hci_si_event);
...@@ -34,31 +34,6 @@ ...@@ -34,31 +34,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
void bt_dump(char *pref, __u8 *buf, int count)
{
char *ptr;
char line[100];
unsigned int i;
printk(KERN_INFO "%s: dump, len %d\n", pref, count);
ptr = line;
*ptr = 0;
for (i = 0; i < count; i++) {
ptr += sprintf(ptr, " %2.2X", buf[i]);
if (i && !((i + 1) % 20)) {
printk(KERN_INFO "%s:%s\n", pref, line);
ptr = line;
*ptr = 0;
}
}
if (line[0])
printk(KERN_INFO "%s:%s\n", pref, line);
}
EXPORT_SYMBOL(bt_dump);
void baswap(bdaddr_t *dst, bdaddr_t *src) void baswap(bdaddr_t *dst, bdaddr_t *src)
{ {
unsigned char *d = (unsigned char *) dst; unsigned char *d = (unsigned char *) dst;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment