There is no need to use a label and a goto for code that is used once only. Moreover having a goto for a single return statement should always be avoided.

Introduced by e368857f66620b8483166e8e6556d9c87f9b3e71 ("batman-adv: Multicast Listener Announcements via Translation Table")

Cc: Linus Lüssing linus.luessing@web.de Signed-off-by: Antonio Quartulli antonio@meshcoding.com ---

Changes from v3: - simply has_bridge() function even more

Changes from v2: - added compat code change to 2/11 to accommodate new use of netdev_master_upper_dev_get_rcu()

Changes from v1: - change "we are out of memory" to "in case of memory allocation failure" in 3/11 - fix commit message in 10/11

multicast.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/multicast.c b/multicast.c index 998b429..d92de1e 100644 --- a/multicast.c +++ b/multicast.c @@ -194,12 +194,10 @@ static bool batadv_mcast_has_bridge(struct batadv_priv *bat_priv)

bridge = batadv_mcast_get_bridge(bat_priv); if (!bridge) - goto out; + return false;

dev_put(bridge); return true; -out: - return false; }

/**