Skip to content

Commit

Permalink
Bluetooth: Convert bt_<level> logging functions to return void
Browse files Browse the repository at this point in the history
No caller or macro uses the return value so make all
the functions return void.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Joe Perches authored and Marcel Holtmann committed Sep 24, 2014
1 parent 48e68ff commit 2b0bf6c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
4 changes: 2 additions & 2 deletions include/net/bluetooth/bluetooth.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ struct bt_voice {
#define BT_RCVMTU 13

__printf(1, 2)
int bt_info(const char *fmt, ...);
void bt_info(const char *fmt, ...);
__printf(1, 2)
int bt_err(const char *fmt, ...);
void bt_err(const char *fmt, ...);

#define BT_INFO(fmt, ...) bt_info(fmt "\n", ##__VA_ARGS__)
#define BT_ERR(fmt, ...) bt_err(fmt "\n", ##__VA_ARGS__)
Expand Down
14 changes: 4 additions & 10 deletions net/bluetooth/lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

0 comments on commit 2b0bf6c

Please sign in to comment.