aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/lib.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2012-02-17 02:32:42 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-17 04:33:17 -0500
commit3ed7003e724a04482e0ef1e794eece8c1c177b37 (patch)
treea098bcf0b24e9b9b0d6a94192e250db91e6c86f4 /net/bluetooth/lib.c
parented2c4ee360709ca838efa0ea4d6295590aff3d24 (diff)
Bluetooth: Add logging functions bt_info and bt_err
Use specific logging functions instead of a generic bt_printk function can save some text. Remove now unused bt_printk function. Add compatibility BT_INFO and BT_ERR macros. (compiled x86 and defconfig with bluetooth and all bluetooth drivers) $ size net/bluetooth/built-in.o* text data bss dec hex filename 381662 20072 100416 502150 7a986 net/bluetooth/built-in.o.allyesconfig.new 382463 20072 100400 502935 7ac97 net/bluetooth/built-in.o.allyesconfig.old 126635 1388 132 128155 1f49b net/bluetooth/built-in.o.defconfig.new 127175 1388 132 128695 1f6b7 net/bluetooth/built-in.o.defconfig.old $ size drivers/bluetooth/built-in.o* 127575 8976 29476 166027 2888b drivers/bluetooth/built-in.o.allyesconfig.new 129512 8976 29516 168004 29044 drivers/bluetooth/built-in.o.allyesconfig.old 52998 3292 156 56446 dc7e drivers/bluetooth/built-in.o.defconfig.new 54358 3292 156 57806 e1ce drivers/bluetooth/built-in.o.defconfig.old Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/lib.c')
-rw-r--r--net/bluetooth/lib.c27
1 files changed, 24 insertions, 3 deletions
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c
index 86a6bed229df..506628876f36 100644
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -24,6 +24,8 @@
24 24
25/* Bluetooth kernel library. */ 25/* Bluetooth kernel library. */
26 26
27#define pr_fmt(fmt) "Bluetooth: " fmt
28
27#include <linux/module.h> 29#include <linux/module.h>
28 30
29#include <linux/kernel.h> 31#include <linux/kernel.h>
@@ -151,7 +153,26 @@ int bt_to_errno(__u16 code)
151} 153}
152EXPORT_SYMBOL(bt_to_errno); 154EXPORT_SYMBOL(bt_to_errno);
153 155
154int bt_printk(const char *level, const char *format, ...) 156int bt_info(const char *format, ...)
157{
158 struct va_format vaf;
159 va_list args;
160 int r;
161
162 va_start(args, format);
163
164 vaf.fmt = format;
165 vaf.va = &args;
166
167 r = pr_info("%pV", &vaf);
168
169 va_end(args);
170
171 return r;
172}
173EXPORT_SYMBOL(bt_info);
174
175int bt_err(const char *format, ...)
155{ 176{
156 struct va_format vaf; 177 struct va_format vaf;
157 va_list args; 178 va_list args;
@@ -162,10 +183,10 @@ int bt_printk(const char *level, const char *format, ...)
162 vaf.fmt = format; 183 vaf.fmt = format;
163 vaf.va = &args; 184 vaf.va = &args;
164 185
165 r = printk("%sBluetooth: %pV\n", level, &vaf); 186 r = pr_err("%pV", &vaf);
166 187
167 va_end(args); 188 va_end(args);
168 189
169 return r; 190 return r;
170} 191}
171EXPORT_SYMBOL(bt_printk); 192EXPORT_SYMBOL(bt_err);