adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bluetooth: Enable per-module dynamic debug messages

Browse source 
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>
This commit is contained in:
Marcel Holtmann 2008-11-30 12:17:28 +01:00
parent 5ddd4a6068
commit a418b893a6
31 changed files with 11 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/bluetooth/bcm203x.c
View file

@ -37,11 +37,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#ifndef CONFIG_BT_HCIBCM203X_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "1.2" #define VERSION "1.2"
static struct usb_device_id bcm203x_table[] = { 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; 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); 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; 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); data->fw_data = kmalloc(firmware->size, GFP_KERNEL);
if (!data->fw_data) { if (!data->fw_data) {

11
drivers/bluetooth/bfusb.c
View file

@ -38,11 +38,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCIBFUSB_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "1.2" #define VERSION "1.2"
static struct usb_driver bfusb_driver; 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; struct sk_buff *skb;
int err, pipe, size = HCI_MAX_FRAME_SIZE + 32; 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))) if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC)))
return -ENOMEM; return -ENOMEM;
@ -354,7 +349,7 @@ static void bfusb_rx_complete(struct urb *urb)
int count = urb->actual_length; int count = urb->actual_length;
int err, hdr, len; 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); read_lock(&data->lock);
@ -691,7 +686,7 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
goto error; 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) { if (bfusb_load_firmware(data, firmware->data, firmware->size) < 0) {
BT_ERR("Firmware loading failed"); BT_ERR("Firmware loading failed");

5
drivers/bluetooth/bpa10x.c
View file

@ -35,11 +35,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCIBPA10X_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "0.10" #define VERSION "0.10"
static struct usb_device_id bpa10x_table[] = { static struct usb_device_id bpa10x_table[] = {

5
drivers/bluetooth/btsdio.c
View file

@ -37,11 +37,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCIBTSDIO_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "0.1" #define VERSION "0.1"
static const struct sdio_device_id btsdio_table[] = { static const struct sdio_device_id btsdio_table[] = {

6
drivers/bluetooth/btusb.c
View file

@ -35,12 +35,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.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" #define VERSION "0.4"
static int ignore_dga; static int ignore_dga;

5
drivers/bluetooth/hci_bcsp.c
View file

@ -47,11 +47,6 @@
#include "hci_uart.h" #include "hci_uart.h"
#ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#endif
#define VERSION "0.3" #define VERSION "0.3"
static int txcrc = 1; static int txcrc = 1;

5
drivers/bluetooth/hci_h4.c
View file

@ -46,11 +46,6 @@
#include "hci_uart.h" #include "hci_uart.h"
#ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#endif
#define VERSION "1.2" #define VERSION "1.2"
struct h4_struct { struct h4_struct {

5
drivers/bluetooth/hci_ldisc.c
View file

@ -46,11 +46,6 @@
#include "hci_uart.h" #include "hci_uart.h"
#ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#endif
#define VERSION "2.2" #define VERSION "2.2"
static int reset = 0; static int reset = 0;

5
drivers/bluetooth/hci_ll.c
View file

@ -51,11 +51,6 @@
#include "hci_uart.h" #include "hci_uart.h"
#ifndef CONFIG_BT_HCIUART_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#endif
/* HCILL commands */ /* HCILL commands */
#define HCILL_GO_TO_SLEEP_IND 0x30 #define HCILL_GO_TO_SLEEP_IND 0x30
#define HCILL_GO_TO_SLEEP_ACK 0x31 #define HCILL_GO_TO_SLEEP_ACK 0x31

5
drivers/bluetooth/hci_vhci.c
View file

@ -40,11 +40,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCIVHCI_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "1.2" #define VERSION "1.2"
static int minor = MISC_DYNAMIC_MINOR; static int minor = MISC_DYNAMIC_MINOR;

2
include/net/bluetooth/bluetooth.h
View file

@ -54,8 +54,8 @@
#define SOL_RFCOMM 18 #define SOL_RFCOMM 18
#define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg) #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg)
#define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __func__ , ## arg)
#define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg) #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg)
#define BT_DBG(fmt, arg...) pr_debug("%s: " fmt "\n" , __func__ , ## arg)
/* Connection and socket states */ /* Connection and socket states */
enum { enum {

7
net/bluetooth/af_bluetooth.c
View file

@ -41,11 +41,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#ifndef CONFIG_BT_SOCK_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "2.14" #define VERSION "2.14"
/* Bluetooth sockets */ /* Bluetooth sockets */
@ -245,7 +240,7 @@ int bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
size_t copied; size_t copied;
int err; int err;
BT_DBG("sock %p sk %p len %d", sock, sk, len); BT_DBG("sock %p sk %p len %zu", sock, sk, len);
if (flags & (MSG_OOB)) if (flags & (MSG_OOB))
return -EOPNOTSUPP; return -EOPNOTSUPP;

2
net/bluetooth/bnep/bnep.h
View file

@ -161,7 +161,7 @@ struct bnep_session {
struct msghdr msg; struct msghdr msg;
struct bnep_proto_filter proto_filter[BNEP_MAX_PROTO_FILTERS]; struct bnep_proto_filter proto_filter[BNEP_MAX_PROTO_FILTERS];
u64 mc_filter; unsigned long long mc_filter;
struct socket *sock; struct socket *sock;
struct net_device *dev; struct net_device *dev;

5
net/bluetooth/bnep/core.c
View file

@ -52,11 +52,6 @@
#include "bnep.h" #include "bnep.h"
#ifndef CONFIG_BT_BNEP_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "1.3" #define VERSION "1.3"
static int compress_src = 1; static int compress_src = 1;

5
net/bluetooth/bnep/netdev.c
View file

@ -41,11 +41,6 @@
#include "bnep.h" #include "bnep.h"
#ifndef CONFIG_BT_BNEP_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#endif
#define BNEP_TX_QUEUE_LEN 20 #define BNEP_TX_QUEUE_LEN 20
static int bnep_net_open(struct net_device *dev) static int bnep_net_open(struct net_device *dev)

5
net/bluetooth/bnep/sock.c
View file

@ -46,11 +46,6 @@
#include "bnep.h" #include "bnep.h"
#ifndef CONFIG_BT_BNEP_DEBUG
#undef BT_DBG
#define BT_DBG( A... )
#endif
static int bnep_sock_release(struct socket *sock) static int bnep_sock_release(struct socket *sock)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;

5
net/bluetooth/cmtp/capi.c
View file

@ -42,11 +42,6 @@
#include "cmtp.h" #include "cmtp.h"
#ifndef CONFIG_BT_CMTP_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define CAPI_INTEROPERABILITY 0x20 #define CAPI_INTEROPERABILITY 0x20
#define CAPI_INTEROPERABILITY_REQ CAPICMD(CAPI_INTEROPERABILITY, CAPI_REQ) #define CAPI_INTEROPERABILITY_REQ CAPICMD(CAPI_INTEROPERABILITY, CAPI_REQ)

5
net/bluetooth/cmtp/core.c
View file

@ -44,11 +44,6 @@
#include "cmtp.h" #include "cmtp.h"
#ifndef CONFIG_BT_CMTP_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "1.0" #define VERSION "1.0"
static DECLARE_RWSEM(cmtp_session_sem); static DECLARE_RWSEM(cmtp_session_sem);

5
net/bluetooth/cmtp/sock.c
View file

@ -43,11 +43,6 @@
#include "cmtp.h" #include "cmtp.h"
#ifndef CONFIG_BT_CMTP_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
static int cmtp_sock_release(struct socket *sock) static int cmtp_sock_release(struct socket *sock)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;

5
net/bluetooth/hci_conn.c
View file

@ -45,11 +45,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCI_CORE_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
void hci_acl_connect(struct hci_conn *conn) void hci_acl_connect(struct hci_conn *conn)
{ {
struct hci_dev *hdev = conn->hdev; struct hci_dev *hdev = conn->hdev;

7
net/bluetooth/hci_core.c
View file

@ -48,11 +48,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCI_CORE_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
static void hci_cmd_task(unsigned long arg); static void hci_cmd_task(unsigned long arg);
static void hci_rx_task(unsigned long arg); static void hci_rx_task(unsigned long arg);
static void hci_tx_task(unsigned long arg); static void hci_tx_task(unsigned long arg);
@ -290,7 +285,7 @@ static void hci_linkpol_req(struct hci_dev *hdev, unsigned long opt)
{ {
__le16 policy = cpu_to_le16(opt); __le16 policy = cpu_to_le16(opt);
BT_DBG("%s %x", hdev->name, opt); BT_DBG("%s %x", hdev->name, policy);
/* Default link policy */ /* Default link policy */
hci_send_cmd(hdev, HCI_OP_WRITE_DEF_LINK_POLICY, 2, &policy); hci_send_cmd(hdev, HCI_OP_WRITE_DEF_LINK_POLICY, 2, &policy);

5
net/bluetooth/hci_event.c
View file

@ -45,11 +45,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCI_CORE_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
/* Handle HCI Event packets */ /* Handle HCI Event packets */
static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb) static void hci_cc_inquiry_cancel(struct hci_dev *hdev, struct sk_buff *skb)

5
net/bluetooth/hci_sock.c
View file

@ -49,11 +49,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCI_SOCK_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
/* ----- HCI socket interface ----- */ /* ----- HCI socket interface ----- */
static inline int hci_test_bit(int nr, void *addr) static inline int hci_test_bit(int nr, void *addr)

5
net/bluetooth/hci_sysfs.c
View file

@ -6,11 +6,6 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#ifndef CONFIG_BT_HCI_CORE_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
struct class *bt_class = NULL; struct class *bt_class = NULL;
EXPORT_SYMBOL_GPL(bt_class); EXPORT_SYMBOL_GPL(bt_class);

5
net/bluetooth/hidp/core.c
View file

@ -47,11 +47,6 @@
#include "hidp.h" #include "hidp.h"
#ifndef CONFIG_BT_HIDP_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "1.2" #define VERSION "1.2"
static DECLARE_RWSEM(hidp_session_sem); static DECLARE_RWSEM(hidp_session_sem);

5
net/bluetooth/hidp/sock.c
View file

@ -39,11 +39,6 @@
#include "hidp.h" #include "hidp.h"
#ifndef CONFIG_BT_HIDP_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
static int hidp_sock_release(struct socket *sock) static int hidp_sock_release(struct socket *sock)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;

5
net/bluetooth/l2cap.c
View file

@ -50,11 +50,6 @@
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#include <net/bluetooth/l2cap.h> #include <net/bluetooth/l2cap.h>
#ifndef CONFIG_BT_L2CAP_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "2.11" #define VERSION "2.11"
static u32 l2cap_feat_mask = 0x0000; static u32 l2cap_feat_mask = 0x0000;

5
net/bluetooth/rfcomm/core.c
View file

@ -46,11 +46,6 @@
#include <net/bluetooth/l2cap.h> #include <net/bluetooth/l2cap.h>
#include <net/bluetooth/rfcomm.h> #include <net/bluetooth/rfcomm.h>
#ifndef CONFIG_BT_RFCOMM_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "1.10" #define VERSION "1.10"
static int disable_cfc = 0; static int disable_cfc = 0;

7
net/bluetooth/rfcomm/sock.c
View file

@ -50,11 +50,6 @@
#include <net/bluetooth/l2cap.h> #include <net/bluetooth/l2cap.h>
#include <net/bluetooth/rfcomm.h> #include <net/bluetooth/rfcomm.h>
#ifndef CONFIG_BT_RFCOMM_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
static const struct proto_ops rfcomm_sock_ops; static const struct proto_ops rfcomm_sock_ops;
static struct bt_sock_list rfcomm_sk_list = { static struct bt_sock_list rfcomm_sk_list = {
@ -644,7 +639,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
msg->msg_namelen = 0; msg->msg_namelen = 0;
BT_DBG("sk %p size %d", sk, size); BT_DBG("sk %p size %zu", sk, size);
lock_sock(sk); lock_sock(sk);

5
net/bluetooth/rfcomm/tty.c
View file

@ -39,11 +39,6 @@
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#include <net/bluetooth/rfcomm.h> #include <net/bluetooth/rfcomm.h>
#ifndef CONFIG_BT_RFCOMM_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define RFCOMM_TTY_MAGIC 0x6d02 /* magic number for rfcomm struct */ #define RFCOMM_TTY_MAGIC 0x6d02 /* magic number for rfcomm struct */
#define RFCOMM_TTY_PORTS RFCOMM_MAX_DEV /* whole lotta rfcomm devices */ #define RFCOMM_TTY_PORTS RFCOMM_MAX_DEV /* whole lotta rfcomm devices */
#define RFCOMM_TTY_MAJOR 216 /* device node major id of the usb/bluetooth.c driver */ #define RFCOMM_TTY_MAJOR 216 /* device node major id of the usb/bluetooth.c driver */

5
net/bluetooth/sco.c
View file

@ -48,11 +48,6 @@
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
#include <net/bluetooth/sco.h> #include <net/bluetooth/sco.h>
#ifndef CONFIG_BT_SCO_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
#endif
#define VERSION "0.6" #define VERSION "0.6"
static int disable_esco = 0; static int disable_esco = 0;