diff mbox

[v2,23/26] batman-adv: Remove unnecessary ret variable

Message ID 1419594103-10928-24-git-send-email-mpa@pengutronix.de (mailing list archive)
State Accepted, archived
Headers

Commit Message

Markus Pargmann Dec. 26, 2014, 11:41 a.m. UTC 
  We can avoid this indirect return variable by directly returning the
error values.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 main.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Comments

Marek Lindner March 13, 2015, 6:04 a.m. UTC | #1 
On Friday, December 26, 2014 12:41:40 Markus Pargmann wrote:
> We can avoid this indirect return variable by directly returning the
> error values.
> 
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> ---
>  main.c | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)

Applied in revision 32a451a.

Thanks,
Marek
diff mbox

Patch

diff --git a/main.c b/main.c
index d5c79ae1db6f..2e2ad071a085 100644
--- a/main.c
+++ b/main.c
@@ -532,14 +532,12 @@  static struct batadv_algo_ops *batadv_algo_get(char *name)
 int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops)
 {
 	struct batadv_algo_ops *bat_algo_ops_tmp;
-	int ret;
 
 	bat_algo_ops_tmp = batadv_algo_get(bat_algo_ops->name);
 	if (bat_algo_ops_tmp) {
 		pr_info("Trying to register already registered routing algorithm: %s\n",
 			bat_algo_ops->name);
-		ret = -EEXIST;
-		goto out;
+		return -EEXIST;
 	}
 
 	/* all algorithms must implement all ops (for now) */
@@ -553,16 +551,13 @@  int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops)
 	    !bat_algo_ops->bat_neigh_is_equiv_or_better) {
 		pr_info("Routing algo '%s' does not implement required ops\n",
 			bat_algo_ops->name);
-		ret = -EINVAL;
-		goto out;
+		return -EINVAL;
 	}
 
 	INIT_HLIST_NODE(&bat_algo_ops->list);
 	hlist_add_head(&bat_algo_ops->list, &batadv_algo_list);
-	ret = 0;
 
-out:
-	return ret;
+	return 0;
 }
 
 int batadv_algo_select(struct batadv_priv *bat_priv, char *name)