b.a.t.m.a.n.lists.open-mesh.org archive mirror
 help / color / mirror / Atom feed
From: Antonio Quartulli <antonio@meshcoding.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
	Marek Lindner <mareklindner@neomailbox.ch>,
	Antonio Quartulli <antonio@meshcoding.com>
Subject: [B.A.T.M.A.N.] [PATCH 08/16] batman-adv: iv_ogm_iface_enable, direct return values
Date: Fri, 29 May 2015 11:05:20 +0200	[thread overview]
Message-ID: <1432890328-8247-9-git-send-email-antonio@meshcoding.com> (raw)
In-Reply-To: <1432890328-8247-1-git-send-email-antonio@meshcoding.com>

From: Markus Pargmann <mpa@pengutronix.de>

Directly return error values. No need to use a return variable.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
---
 net/batman-adv/bat_iv_ogm.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index fc299c0..123aabb 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -308,7 +308,6 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
 	struct batadv_ogm_packet *batadv_ogm_packet;
 	unsigned char *ogm_buff;
 	uint32_t random_seqno;
-	int res = -ENOMEM;
 
 	/* randomize initial seqno to avoid collision */
 	get_random_bytes(&random_seqno, sizeof(random_seqno));
@@ -317,7 +316,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
 	hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
 	ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
 	if (!ogm_buff)
-		goto out;
+		return -ENOMEM;
 
 	hard_iface->bat_iv.ogm_buff = ogm_buff;
 
@@ -329,10 +328,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
 	batadv_ogm_packet->reserved = 0;
 	batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE;
 
-	res = 0;
-
-out:
-	return res;
+	return 0;
 }
 
 static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface)
-- 
2.4.2


  parent reply	other threads:[~2015-05-29  9:05 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29  9:05 [B.A.T.M.A.N.] pull request: batman-adv 2015-05-29 Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 01/16] batman-adv: Start new development cycle Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 02/16] batman-adv: update copyright years for 2015 Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 03/16] batman-adv: Check total_size when queueing fragments Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 04/16] batman-adv: Use only queued fragments when merging Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 05/16] batman-adv: debugfs, avoid compiling for !DEBUG_FS Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 06/16] batman-adv: tvlv realloc, move error handling into if block Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 07/16] batman-adv: Makefile, Sort alphabetically Antonio Quartulli
2015-05-29  9:05 ` Antonio Quartulli [this message]
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 09/16] batman-adv: iv_ogm_aggr_packet, bool return value Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 10/16] batman-adv: iv_ogm_send_to_if, declare char* as const Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 11/16] batman-adv: Use safer default config for optional features Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 12/16] batman-adv: checkpatch - comparison to NULL could be rewritten Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 13/16] batman-adv: checkpatch - spaces preferred around that '*' Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 14/16] batman-adv: iv_ogm_can_aggregate, code readability Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 15/16] batman-adv: iv_ogm_orig_update, remove unnecessary brackets Antonio Quartulli
2015-05-29  9:05 ` [B.A.T.M.A.N.] [PATCH 16/16] batman-adv: Use common declaration order in *_send_skb_(packet|unicast) Antonio Quartulli
2015-05-31  8:08 ` [B.A.T.M.A.N.] pull request: batman-adv 2015-05-29 David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432890328-8247-9-git-send-email-antonio@meshcoding.com \
    --to=antonio@meshcoding.com \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    --cc=davem@davemloft.net \
    --cc=mareklindner@neomailbox.ch \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).