Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a418b893 authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 5ddd4a60

drivers/bluetooth/bcm203x.c

+2 −7
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ 


#include <net/bluetooth/bluetooth.h>



#ifndef CONFIG_BT_HCIBCM203X_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "1.2"



static struct usb_device_id bcm203x_table[] = {
@@ -199,7 +194,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		return -EIO;

	}



	BT_DBG("minidrv data %p size %d", firmware->data, firmware->size);

	BT_DBG("minidrv data %p size %zu", firmware->data, firmware->size);



	size = max_t(uint, firmware->size, 4096);
@@ -227,7 +222,7 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		return -EIO;

	}



	BT_DBG("firmware data %p size %d", firmware->data, firmware->size);

	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);



	data->fw_data = kmalloc(firmware->size, GFP_KERNEL);

	if (!data->fw_data) {

drivers/bluetooth/bfusb.c

+3 −8
Original line number Diff line number Diff line
@@ -38,11 +38,6 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#ifndef CONFIG_BT_HCIBFUSB_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "1.2"



static struct usb_driver bfusb_driver;
@@ -221,7 +216,7 @@ static int bfusb_rx_submit(struct bfusb_data *data, struct urb *urb) 
	struct sk_buff *skb;

	int err, pipe, size = HCI_MAX_FRAME_SIZE + 32;



	BT_DBG("bfusb %p urb %p", bfusb, urb);

	BT_DBG("bfusb %p urb %p", data, urb);



	if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC)))

		return -ENOMEM;
@@ -354,7 +349,7 @@ static void bfusb_rx_complete(struct urb *urb) 
	int count = urb->actual_length;

	int err, hdr, len;



	BT_DBG("bfusb %p urb %p skb %p len %d", bfusb, urb, skb, skb->len);

	BT_DBG("bfusb %p urb %p skb %p len %d", data, urb, skb, skb->len);



	read_lock(&data->lock);
@@ -691,7 +686,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 
		goto error;

	}



	BT_DBG("firmware data %p size %d", firmware->data, firmware->size);

	BT_DBG("firmware data %p size %zu", firmware->data, firmware->size);



	if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) {

		BT_ERR("Firmware loading failed");

drivers/bluetooth/bpa10x.c

+0 −5
Original line number Diff line number Diff line
@@ -35,11 +35,6 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#ifndef CONFIG_BT_HCIBPA10X_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "0.10"



static struct usb_device_id bpa10x_table[] = {

drivers/bluetooth/btsdio.c

+0 −5
Original line number Diff line number Diff line
@@ -37,11 +37,6 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#ifndef CONFIG_BT_HCIBTSDIO_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "0.1"



static const struct sdio_device_id btsdio_table[] = {

drivers/bluetooth/btusb.c

+0 −6
Original line number Diff line number Diff line
@@ -35,12 +35,6 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



//#define CONFIG_BT_HCIBTUSB_DEBUG

#ifndef CONFIG_BT_HCIBTUSB_DEBUG

#undef  BT_DBG

#define BT_DBG(D...)

#endif



#define VERSION "0.4"



static int ignore_dga;