batman-adv: Remove unnecessary OOM logging messages

Removing unnecessary messages saves code and text.

Site specific OOM messages are duplications of a generic MM
out of memory message and aren't really useful, so just
delete them.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index 0cc0f04bf39787f95384c15da419e37acdd8a219..7704df468e0b4ec32eefa9fcd2c12fae1162a5cf 100644 (file)
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -434,11 +434,8 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
        dev_hold(net_dev);
 
        hard_iface = kmalloc(sizeof(*hard_iface), GFP_ATOMIC);
-       if (!hard_iface) {
-               pr_err("Can't add interface (%s): out of memory\n",
-                      net_dev->name);
+       if (!hard_iface)
                goto release_dev;
-       }
 
        ret = sysfs_add_hardif(&hard_iface->hardif_obj, net_dev);
        if (ret)

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c
index 79b9ae522ce9b5ea63f88deba00bae01812bf944..fb87bdc2ce9bdba9b551f90fcdcada42fdc594a4 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/main.c
@@ -117,8 +117,6 @@ int mesh_init(struct net_device *soft_iface)
        goto end;
 
 err:
-       pr_err("Unable to allocate memory for mesh information structures: "
-              "out of mem ?\n");
        mesh_free(soft_iface);
        return -1;
 

diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c
index cd7d2566ff5f53dd6f0cead14abc5137c1c529d1..0e5b77255d9994db9c4cc9fb64f677d82271f3f8 100644 (file)
--- a/net/batman-adv/originator.c
+++ b/net/batman-adv/originator.c
@@ -492,10 +492,8 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
 
        data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS,
                           GFP_ATOMIC);
-       if (!data_ptr) {
-               pr_err("Can't resize orig: out of memory\n");
+       if (!data_ptr)
                return -1;
-       }
 
        memcpy(data_ptr, orig_node->bcast_own,
               (max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS);
@@ -503,10 +501,8 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)
        orig_node->bcast_own = data_ptr;
 
        data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
-       if (!data_ptr) {
-               pr_err("Can't resize orig: out of memory\n");
+       if (!data_ptr)
                return -1;
-       }
 
        memcpy(data_ptr, orig_node->bcast_own_sum,
               (max_if_num - 1) * sizeof(uint8_t));
@@ -561,10 +557,8 @@ static int orig_node_del_if(struct orig_node *orig_node,
 
        chunk_size = sizeof(unsigned long) * NUM_WORDS;
        data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);
-       if (!data_ptr) {
-               pr_err("Can't resize orig: out of memory\n");
+       if (!data_ptr)
                return -1;
-       }
 
        /* copy first part */
        memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);
@@ -582,10 +576,8 @@ free_bcast_own:
                goto free_own_sum;
 
        data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
-       if (!data_ptr) {
-               pr_err("Can't resize orig: out of memory\n");
+       if (!data_ptr)
                return -1;
-       }
 
        memcpy(data_ptr, orig_node->bcast_own_sum,
               del_if_num * sizeof(uint8_t));

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 7d8332ec44d009cdd93b5587118a67de64ebd1aa..aceeabc2ca86dde0b197b217ebae4c6162f49b3d 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -801,10 +801,8 @@ struct net_device *softif_create(const char *name)
 
        soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup);
 
-       if (!soft_iface) {
-               pr_err("Unable to allocate the batman interface: %s\n", name);
+       if (!soft_iface)
                goto out;
-       }
 
        ret = register_netdevice(soft_iface);
        if (ret < 0) {

diff --git a/net/batman-adv/vis.c b/net/batman-adv/vis.c
index fb9b19fc638d413c96916ff3837a772061b6ce55..f81a6b668b0c524d33f4f3b7794e2181a1897a9b 100644 (file)
--- a/net/batman-adv/vis.c
+++ b/net/batman-adv/vis.c
@@ -887,10 +887,8 @@ int vis_init(struct bat_priv *bat_priv)
        }
 
        bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
-       if (!bat_priv->my_vis_info) {
-               pr_err("Can't initialize vis packet\n");
+       if (!bat_priv->my_vis_info)
                goto err;
-       }
 
        bat_priv->my_vis_info->skb_packet = dev_alloc_skb(sizeof(*packet) +
                                                          MAX_VIS_PACKET_SIZE +