aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-11-30 06:17:28 -0500
committerMarcel Holtmann <marcel@holtmann.org>2008-11-30 06:17:28 -0500
commita418b893a6af11ae73c762ed5b76c1bad6dc19d8 (patch)
treea24f9192988e4d55077d77420b90dc3cfd647a06 /drivers
parent5ddd4a60683f819982b7bd3d1aee972f931c11a3 (diff)
Bluetooth: Enable per-module dynamic debug messages
With the introduction of CONFIG_DYNAMIC_PRINTK_DEBUG it is possible to allow debugging without having to recompile the kernel. This patch turns all BT_DBG() calls into pr_debug() to support dynamic debug messages. As a side effect all CONFIG_BT_*_DEBUG statements are now removed and some broken debug entries have been fixed. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/bluetooth/bcm203x.c9
-rw-r--r--drivers/bluetooth/bfusb.c11
-rw-r--r--drivers/bluetooth/bpa10x.c5
-rw-r--r--drivers/bluetooth/btsdio.c5
-rw-r--r--drivers/bluetooth/btusb.c6
-rw-r--r--drivers/bluetooth/hci_bcsp.c5
-rw-r--r--drivers/bluetooth/hci_h4.c5
-rw-r--r--drivers/bluetooth/hci_ldisc.c5
-rw-r--r--drivers/bluetooth/hci_ll.c5
-rw-r--r--drivers/bluetooth/hci_vhci.c5
10 files changed, 5 insertions, 56 deletions
diff --git a/drivers/bluetooth/bcm203x.c b/drivers/bluetooth/bcm203x.c
index ee40201c7278..eafd4af0746e 100644
--- a/drivers/bluetooth/bcm203x.c
+++ b/drivers/bluetooth/bcm203x.c
@@ -37,11 +37,6 @@
37 37
38#include <net/bluetooth/bluetooth.h> 38#include <net/bluetooth/bluetooth.h>
39 39
40#ifndef CONFIG_BT_HCIBCM203X_DEBUG
41#undef BT_DBG
42#define BT_DBG(D...)
43#endif
44
45#define VERSION "1.2" 40#define VERSION "1.2"
46 41
47static struct usb_device_id bcm203x_table[] = { 42static struct usb_device_id bcm203x_table[] = {
@@ -199,7 +194,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
199 return -EIO; 194 return -EIO;
200 } 195 }
201 196
202 BT_DBG("minidrv data %p size %d", firmware->data, firmware->size); 197 BT_DBG("minidrv data %p size %zu", firmware->data, firmware->size);
203 198
204 size = max_t(uint, firmware->size, 4096); 199 size = max_t(uint, firmware->size, 4096);
205 200
@@ -227,7 +222,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id
227 return -EIO; 222 return -EIO;
228 } 223 }
229 224
230 BT_DBG("firmware data %p size %d", firmware->data, firmware->size); 225 BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
231 226
232 data->fw_data = kmalloc(firmware->size, GFP_KERNEL); 227 data->fw_data = kmalloc(firmware->size, GFP_KERNEL);
233 if (!data->fw_data) { 228 if (!data->fw_data) {
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c
index 90a094634630..d3f14bee0f19 100644
--- a/drivers/bluetooth/bfusb.c
+++ b/drivers/bluetooth/bfusb.c
@@ -38,11 +38,6 @@
38#include <net/bluetooth/bluetooth.h> 38#include <net/bluetooth/bluetooth.h>
39#include <net/bluetooth/hci_core.h> 39#include <net/bluetooth/hci_core.h>
40 40
41#ifndef CONFIG_BT_HCIBFUSB_DEBUG
42#undef BT_DBG
43#define BT_DBG(D...)
44#endif
45
46#define VERSION "1.2" 41#define VERSION "1.2"
47 42
48static struct usb_driver bfusb_driver; 43static struct usb_driver bfusb_driver;
@@ -221,7 +216,7 @@ static int bfusb_rx_submit(struct bfusb_data *data, struct urb *urb)
221 struct sk_buff *skb; 216 struct sk_buff *skb;
222 int err, pipe, size = HCI_MAX_FRAME_SIZE + 32; 217 int err, pipe, size = HCI_MAX_FRAME_SIZE + 32;
223 218
224 BT_DBG("bfusb %p urb %p", bfusb, urb); 219 BT_DBG("bfusb %p urb %p", data, urb);
225 220
226 if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC))) 221 if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC)))
227 return -ENOMEM; 222 return -ENOMEM;
@@ -354,7 +349,7 @@ static void bfusb_rx_complete(struct urb *urb)
354 int count = urb->actual_length; 349 int count = urb->actual_length;
355 int err, hdr, len; 350 int err, hdr, len;
356 351
357 BT_DBG("bfusb %p urb %p skb %p len %d", bfusb, urb, skb, skb->len); 352 BT_DBG("bfusb %p urb %p skb %p len %d", data, urb, skb, skb->len);
358 353
359 read_lock(&data->lock); 354 read_lock(&data->lock);
360 355
@@ -691,7 +686,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
691 goto error; 686 goto error;
692 } 687 }
693 688
694 BT_DBG("firmware data %p size %d", firmware->data, firmware->size); 689 BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);
695 690
696 if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) { 691 if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) {
697 BT_ERR("Firmware loading failed"); 692 BT_ERR("Firmware loading failed");
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 4f0a57236d23..c115285867c3 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -35,11 +35,6 @@
35#include <net/bluetooth/bluetooth.h> 35#include <net/bluetooth/bluetooth.h>
36#include <net/bluetooth/hci_core.h> 36#include <net/bluetooth/hci_core.h>
37 37
38#ifndef CONFIG_BT_HCIBPA10X_DEBUG
39#undef BT_DBG
40#define BT_DBG(D...)
41#endif
42
43#define VERSION "0.10" 38#define VERSION "0.10"
44 39
45static struct usb_device_id bpa10x_table[] = { 40static struct usb_device_id bpa10x_table[] = {
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index f2ada0c65486..7e298275c8f6 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -37,11 +37,6 @@
37#include <net/bluetooth/bluetooth.h> 37#include <net/bluetooth/bluetooth.h>
38#include <net/bluetooth/hci_core.h> 38#include <net/bluetooth/hci_core.h>
39 39
40#ifndef CONFIG_BT_HCIBTSDIO_DEBUG
41#undef BT_DBG
42#define BT_DBG(D...)
43#endif
44
45#define VERSION "0.1" 40#define VERSION "0.1"
46 41
47static const struct sdio_device_id btsdio_table[] = { 42static const struct sdio_device_id btsdio_table[] = {
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 7f7526c186d0..b5fbda6d490a 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -35,12 +35,6 @@
35#include <net/bluetooth/bluetooth.h> 35#include <net/bluetooth/bluetooth.h>
36#include <net/bluetooth/hci_core.h> 36#include <net/bluetooth/hci_core.h>
37 37
38//#define CONFIG_BT_HCIBTUSB_DEBUG
39#ifndef CONFIG_BT_HCIBTUSB_DEBUG
40#undef BT_DBG
41#define BT_DBG(D...)
42#endif
43
44#define VERSION "0.4" 38#define VERSION "0.4"
45 39
46static int ignore_dga; 40static int ignore_dga;
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 7938062c1cc7..894b2cb11ea6 100644
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -47,11 +47,6 @@
47 47
48#include "hci_uart.h" 48#include "hci_uart.h"
49 49
50#ifndef CONFIG_BT_HCIUART_DEBUG
51#undef BT_DBG
52#define BT_DBG( A... )
53#endif
54
55#define VERSION "0.3" 50#define VERSION "0.3"
56 51
57static int txcrc = 1; 52static int txcrc = 1;
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index bfbae14cf93d..b0fafb055996 100644
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -46,11 +46,6 @@
46 46
47#include "hci_uart.h" 47#include "hci_uart.h"
48 48
49#ifndef CONFIG_BT_HCIUART_DEBUG
50#undef BT_DBG
51#define BT_DBG( A... )
52#endif
53
54#define VERSION "1.2" 49#define VERSION "1.2"
55 50
56struct h4_struct { 51struct h4_struct {
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index cb46bf52a19a..af761dc434f6 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -46,11 +46,6 @@
46 46
47#include "hci_uart.h" 47#include "hci_uart.h"
48 48
49#ifndef CONFIG_BT_HCIUART_DEBUG
50#undef BT_DBG
51#define BT_DBG( A... )
52#endif
53
54#define VERSION "2.2" 49#define VERSION "2.2"
55 50
56static int reset = 0; 51static int reset = 0;
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c
index 2d2f66e17fea..b91d45a41b2f 100644
--- a/drivers/bluetooth/hci_ll.c
+++ b/drivers/bluetooth/hci_ll.c
@@ -51,11 +51,6 @@
51 51
52#include "hci_uart.h" 52#include "hci_uart.h"
53 53
54#ifndef CONFIG_BT_HCIUART_DEBUG
55#undef BT_DBG
56#define BT_DBG( A... )
57#endif
58
59/* HCILL commands */ 54/* HCILL commands */
60#define HCILL_GO_TO_SLEEP_IND 0x30 55#define HCILL_GO_TO_SLEEP_IND 0x30
61#define HCILL_GO_TO_SLEEP_ACK 0x31 56#define HCILL_GO_TO_SLEEP_ACK 0x31
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 7320a71b6368..0bbefba6469c 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -40,11 +40,6 @@
40#include <net/bluetooth/bluetooth.h> 40#include <net/bluetooth/bluetooth.h>
41#include <net/bluetooth/hci_core.h> 41#include <net/bluetooth/hci_core.h>
42 42
43#ifndef CONFIG_BT_HCIVHCI_DEBUG
44#undef BT_DBG
45#define BT_DBG(D...)
46#endif
47
48#define VERSION "1.2" 43#define VERSION "1.2"
49 44
50static int minor = MISC_DYNAMIC_MINOR; 45static int minor = MISC_DYNAMIC_MINOR;