From 93b359d0ea6979f68a2631e645a49496f1a432cb Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 29 Aug 2011 14:17:24 -0700
Subject: [PATCH] --- yaml --- r: 266137 b: refs/heads/master c:
 320f422f629c7ed5d07b4186aa491d1e11d18a4c h: refs/heads/master i:   266135:
 86c417c4997367e3ee5f244bb37d247b1dec263a v: v3

---
 [refs]                                |  2 +-
 trunk/net/batman-adv/hard-interface.c |  5 +----
 trunk/net/batman-adv/main.c           |  2 --
 trunk/net/batman-adv/originator.c     | 16 ++++------------
 trunk/net/batman-adv/soft-interface.c |  4 +---
 trunk/net/batman-adv/vis.c            |  4 +---
 6 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index c23aa72f399d..e247fc49ac66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45485ad7d24f9f1de964b3aea8beb199dbac141c
+refs/heads/master: 320f422f629c7ed5d07b4186aa491d1e11d18a4c
diff --git a/trunk/net/batman-adv/hard-interface.c b/trunk/net/batman-adv/hard-interface.c
index 0cc0f04bf397..7704df468e0b 100644
--- a/trunk/net/batman-adv/hard-interface.c
+++ b/trunk/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/trunk/net/batman-adv/main.c b/trunk/net/batman-adv/main.c
index 79b9ae522ce9..fb87bdc2ce9b 100644
--- a/trunk/net/batman-adv/main.c
+++ b/trunk/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/trunk/net/batman-adv/originator.c b/trunk/net/batman-adv/originator.c
index cd7d2566ff5f..0e5b77255d99 100644
--- a/trunk/net/batman-adv/originator.c
+++ b/trunk/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 @@ static int orig_node_del_if(struct orig_node *orig_node,
 		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/trunk/net/batman-adv/soft-interface.c b/trunk/net/batman-adv/soft-interface.c
index 7d8332ec44d0..aceeabc2ca86 100644
--- a/trunk/net/batman-adv/soft-interface.c
+++ b/trunk/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/trunk/net/batman-adv/vis.c b/trunk/net/batman-adv/vis.c
index fb9b19fc638d..f81a6b668b0c 100644
--- a/trunk/net/batman-adv/vis.c
+++ b/trunk/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 +