Staging: batman-adv: Move printk to simplified macros

[net-next-2.6.git] / drivers / staging / batman-adv / originator.c

diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c
index 3febdb83154d9f21687f3e166a3cbb33e3dd3bf9..d2a5f20f94a93277419f7ae397ab3a5776c1e835 100644 (file)
--- a/drivers/staging/batman-adv/originator.c
+++ b/drivers/staging/batman-adv/originator.c
@@ -167,8 +167,8 @@ struct orig_node *get_orig_node(uint8_t *addr)
                swaphash = hash_resize(orig_hash, orig_hash->size * 2);
 
                if (swaphash == NULL)
-                       printk(KERN_ERR
-                              "batman-adv:Couldn't resize orig hash table\n");
+                       bat_err(soft_device,
+                               "Couldn't resize orig hash table\n");
                else
                        orig_hash = swaphash;
        }
@@ -357,8 +357,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
        data_ptr = kmalloc(max_if_num * sizeof(TYPE_OF_WORD) * NUM_WORDS,
                           GFP_ATOMIC);
        if (!data_ptr) {
-               printk(KERN_ERR
-                      "batman-adv:Can't resize orig: out of memory\n");
+               pr_err("Can't resize orig: out of memory\n");
                return -1;
        }
 
@@ -369,8 +368,7 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
 
        data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
        if (!data_ptr) {
-               printk(KERN_ERR
-                      "batman-adv:Can't resize orig: out of memory\n");
+               pr_err("Can't resize orig: out of memory\n");
                return -1;
        }
 
@@ -419,8 +417,7 @@ static int orig_node_del_if(struct orig_node *orig_node,
        chunk_size = sizeof(TYPE_OF_WORD) * NUM_WORDS;
        data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);
        if (!data_ptr) {
-               printk(KERN_ERR
-                      "batman-adv:Can't resize orig: out of memory\n");
+               pr_err("Can't resize orig: out of memory\n");
                return -1;
        }
 
@@ -441,8 +438,7 @@ free_bcast_own:
 
        data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
        if (!data_ptr) {
-               printk(KERN_ERR
-                      "batman-adv:Can't resize orig: out of memory\n");
+               pr_err("Can't resize orig: out of memory\n");
                return -1;
        }