aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/bluetooth/bluetooth.h4
-rw-r--r--net/bluetooth/lib.c14
2 files changed, 6 insertions, 12 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 7e666d06b97f..58695ffeb138 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -120,9 +120,9 @@ struct bt_voice {
120#define BT_RCVMTU 13 120#define BT_RCVMTU 13
121 121
122__printf(1, 2) 122__printf(1, 2)
123int bt_info(const char *fmt, ...); 123void bt_info(const char *fmt, ...);
124__printf(1, 2) 124__printf(1, 2)
125int bt_err(const char *fmt, ...); 125void bt_err(const char *fmt, ...);
126 126
127#define BT_INFO(fmt, ...) bt_info(fmt "\n", ##__VA_ARGS__) 127#define BT_INFO(fmt, ...) bt_info(fmt "\n", ##__VA_ARGS__)
128#define BT_ERR(fmt, ...) bt_err(fmt "\n", ##__VA_ARGS__) 128#define BT_ERR(fmt, ...) bt_err(fmt "\n", ##__VA_ARGS__)
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c
index 941ad7530eda..b36bc0415854 100644
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -135,40 +135,34 @@ int bt_to_errno(__u16 code)
135} 135}
136EXPORT_SYMBOL(bt_to_errno); 136EXPORT_SYMBOL(bt_to_errno);
137 137
138int bt_info(const char *format, ...) 138void bt_info(const char *format, ...)
139{ 139{
140 struct va_format vaf; 140 struct va_format vaf;
141 va_list args; 141 va_list args;
142 int r;
143 142
144 va_start(args, format); 143 va_start(args, format);
145 144
146 vaf.fmt = format; 145 vaf.fmt = format;
147 vaf.va = &args; 146 vaf.va = &args;
148 147
149 r = pr_info("%pV", &vaf); 148 pr_info("%pV", &vaf);
150 149
151 va_end(args); 150 va_end(args);
152
153 return r;
154} 151}
155EXPORT_SYMBOL(bt_info); 152EXPORT_SYMBOL(bt_info);
156 153
157int bt_err(const char *format, ...) 154void bt_err(const char *format, ...)
158{ 155{
159 struct va_format vaf; 156 struct va_format vaf;
160 va_list args; 157 va_list args;
161 int r;
162 158
163 va_start(args, format); 159 va_start(args, format);
164 160
165 vaf.fmt = format; 161 vaf.fmt = format;
166 vaf.va = &args; 162 vaf.va = &args;
167 163
168 r = pr_err("%pV", &vaf); 164 pr_err("%pV", &vaf);
169 165
170 va_end(args); 166 va_end(args);
171
172 return r;
173} 167}
174EXPORT_SYMBOL(bt_err); 168EXPORT_SYMBOL(bt_err);