summaryrefslogtreecommitdiffstats
path: root/drivers/staging/batman-adv/icmp_socket.c
diff options
context:
space:
mode:
authorSven Eckelmann <sven.eckelmann@gmx.de>2010-07-06 21:05:17 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-08 12:23:29 -0700
commitc1641862f88367602f8f34a17b21bdf1eee912ee (patch)
tree22cf98b87d41bf5437ca8fcf7d53f29ebc544809 /drivers/staging/batman-adv/icmp_socket.c
parent84ec08640786592a045b783fb28b542415521bf9 (diff)
downloadop-kernel-dev-c1641862f88367602f8f34a17b21bdf1eee912ee.zip
op-kernel-dev-c1641862f88367602f8f34a17b21bdf1eee912ee.tar.gz
Staging: batman-adv: Move printk to simplified macros
Each general printk which is not informative by itself for a specific batX device were moved to pr_(info|warning|err) as it provides an easy interface which for example resolves the problem to add the prefix "batman-adv: " before each line. All information which is specific to a batX device will be printed using a bat_(info|err|warning) macro to prefix it also with "batman-adv: batX:" in each line. Reported-by: Joe Perches <joe@perches.com> Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/batman-adv/icmp_socket.c')
-rw-r--r--drivers/staging/batman-adv/icmp_socket.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/batman-adv/icmp_socket.c b/drivers/staging/batman-adv/icmp_socket.c
index eea4ed7..532f246 100644
--- a/drivers/staging/batman-adv/icmp_socket.c
+++ b/drivers/staging/batman-adv/icmp_socket.c
@@ -19,9 +19,9 @@
*
*/
+#include "main.h"
#include <linux/debugfs.h>
#include <linux/slab.h>
-#include "main.h"
#include "icmp_socket.h"
#include "send.h"
#include "types.h"
@@ -58,8 +58,7 @@ static int bat_socket_open(struct inode *inode, struct file *file)
}
if (i == ARRAY_SIZE(socket_client_hash)) {
- printk(KERN_ERR "batman-adv:"
- "Error - can't add another packet client: "
+ pr_err("Error - can't add another packet client: "
"maximum number of clients reached\n");
kfree(socket_client);
return -EXFULL;
OpenPOWER on IntegriCloud