diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2014-12-26 14:41:40 +0300 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2015-06-03 16:57:24 +0300 |
| commit | 9fb6c6519b10aee4815591122ce59ce4b63fc44b (patch) | |
| tree | ef818eb15b67e8af95af35e6067e61dde876d633 | |
| parent | f2d5cf2add74ac066572b5215ba8a33dfcf0b85c (diff) | |
| download | linux-9fb6c6519b10aee4815591122ce59ce4b63fc44b.tar.xz | |
batman-adv: Remove unnecessary ret variable
We can avoid this indirect return variable by directly returning the
error values.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
| -rw-r--r-- | net/batman-adv/main.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index a22247a61d3e..49f07e1e0f5f 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -513,14 +513,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) */ @@ -534,16 +532,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) |