The following commit has been merged in the master branch: commit f372d09059a67f57b3d2b5eab8c05b0ddb8ca92f Author: Markus Pargmann mpa@pengutronix.de Date: Fri Dec 26 12:41:41 2014 +0100

batman-adv: Remove unnecessary ret variable in algo_register

Remove ret variable and all jumps.

Signed-off-by: Markus Pargmann mpa@pengutronix.de Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index 49f07e1..548e405 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -544,17 +544,14 @@ int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops) int batadv_algo_select(struct batadv_priv *bat_priv, char *name) { struct batadv_algo_ops *bat_algo_ops; - int ret = -EINVAL;

bat_algo_ops = batadv_algo_get(name); if (!bat_algo_ops) - goto out; + return -EINVAL;

bat_priv->bat_algo_ops = bat_algo_ops; - ret = 0;

-out: - return ret; + return 0; }

int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)