diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-09-26 13:38:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-09-26 13:38:51 -0400 |
commit | 30d3c071a64ad8a0aaef8fbd9513698889456680 (patch) | |
tree | ec2402c9730db5a7b735d0d25025456d2b34d264 /net/bluetooth/lib.c | |
parent | 330bd4ec9d046a6e6f8b7cf4a53c2d15b7705e00 (diff) | |
parent | 565766b087a6d6ff257f5b79c8ceda0188c9169f (diff) |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/lib.c')
-rw-r--r-- | net/bluetooth/lib.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c index 941ad7530ed..b36bc041585 100644 --- a/net/bluetooth/lib.c +++ b/net/bluetooth/lib.c @@ -135,40 +135,34 @@ int bt_to_errno(__u16 code) } EXPORT_SYMBOL(bt_to_errno); -int bt_info(const char *format, ...) +void bt_info(const char *format, ...) { struct va_format vaf; va_list args; - int r; va_start(args, format); vaf.fmt = format; vaf.va = &args; - r = pr_info("%pV", &vaf); + pr_info("%pV", &vaf); va_end(args); - - return r; } EXPORT_SYMBOL(bt_info); -int bt_err(const char *format, ...) +void bt_err(const char *format, ...) { struct va_format vaf; va_list args; - int r; va_start(args, format); vaf.fmt = format; vaf.va = &args; - r = pr_err("%pV", &vaf); + pr_err("%pV", &vaf); va_end(args); - - return r; } EXPORT_SYMBOL(bt_err); |