diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2008-11-30 06:17:28 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2008-11-30 06:17:28 -0500 |
commit | a418b893a6af11ae73c762ed5b76c1bad6dc19d8 (patch) | |
tree | a24f9192988e4d55077d77420b90dc3cfd647a06 /net/bluetooth/rfcomm | |
parent | 5ddd4a60683f819982b7bd3d1aee972f931c11a3 (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 'net/bluetooth/rfcomm')
-rw-r--r-- | net/bluetooth/rfcomm/core.c | 5 | ||||
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 7 | ||||
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 5 |
3 files changed, 1 insertions, 16 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index ba537fae0a4c..37c640d1c3fd 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
@@ -46,11 +46,6 @@ | |||
46 | #include <net/bluetooth/l2cap.h> | 46 | #include <net/bluetooth/l2cap.h> |
47 | #include <net/bluetooth/rfcomm.h> | 47 | #include <net/bluetooth/rfcomm.h> |
48 | 48 | ||
49 | #ifndef CONFIG_BT_RFCOMM_DEBUG | ||
50 | #undef BT_DBG | ||
51 | #define BT_DBG(D...) | ||
52 | #endif | ||
53 | |||
54 | #define VERSION "1.10" | 49 | #define VERSION "1.10" |
55 | 50 | ||
56 | static int disable_cfc = 0; | 51 | static int disable_cfc = 0; |
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index bc0d4a7ce6ae..ad00cbf449cb 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -50,11 +50,6 @@ | |||
50 | #include <net/bluetooth/l2cap.h> | 50 | #include <net/bluetooth/l2cap.h> |
51 | #include <net/bluetooth/rfcomm.h> | 51 | #include <net/bluetooth/rfcomm.h> |
52 | 52 | ||
53 | #ifndef CONFIG_BT_RFCOMM_DEBUG | ||
54 | #undef BT_DBG | ||
55 | #define BT_DBG(D...) | ||
56 | #endif | ||
57 | |||
58 | static const struct proto_ops rfcomm_sock_ops; | 53 | static const struct proto_ops rfcomm_sock_ops; |
59 | 54 | ||
60 | static struct bt_sock_list rfcomm_sk_list = { | 55 | static struct bt_sock_list rfcomm_sk_list = { |
@@ -644,7 +639,7 @@ static int rfcomm_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
644 | 639 | ||
645 | msg->msg_namelen = 0; | 640 | msg->msg_namelen = 0; |
646 | 641 | ||
647 | BT_DBG("sk %p size %d", sk, size); | 642 | BT_DBG("sk %p size %zu", sk, size); |
648 | 643 | ||
649 | lock_sock(sk); | 644 | lock_sock(sk); |
650 | 645 | ||
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index d3340dd52bcf..1e4100bb0b65 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
@@ -39,11 +39,6 @@ | |||
39 | #include <net/bluetooth/hci_core.h> | 39 | #include <net/bluetooth/hci_core.h> |
40 | #include <net/bluetooth/rfcomm.h> | 40 | #include <net/bluetooth/rfcomm.h> |
41 | 41 | ||
42 | #ifndef CONFIG_BT_RFCOMM_DEBUG | ||
43 | #undef BT_DBG | ||
44 | #define BT_DBG(D...) | ||
45 | #endif | ||
46 | |||
47 | #define RFCOMM_TTY_MAGIC 0x6d02 /* magic number for rfcomm struct */ | 42 | #define RFCOMM_TTY_MAGIC 0x6d02 /* magic number for rfcomm struct */ |
48 | #define RFCOMM_TTY_PORTS RFCOMM_MAX_DEV /* whole lotta rfcomm devices */ | 43 | #define RFCOMM_TTY_PORTS RFCOMM_MAX_DEV /* whole lotta rfcomm devices */ |
49 | #define RFCOMM_TTY_MAJOR 216 /* device node major id of the usb/bluetooth.c driver */ | 44 | #define RFCOMM_TTY_MAJOR 216 /* device node major id of the usb/bluetooth.c driver */ |