The following commit has been merged in the master branch: commit 193924472a2514f7d9e4d08cf184e9a5f2b9309d Author: Antonio Quartulli antonio@meshcoding.com Date: Mon Jul 21 10:03:59 2014 +0200

batman-adv: avoid useless return in void functions

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

diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index a12e25e..1485091 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -233,7 +233,6 @@ static int batadv_debug_log_setup(struct batadv_priv *bat_priv)

static void batadv_debug_log_cleanup(struct batadv_priv *bat_priv) { - return; } #endif

diff --git a/net/batman-adv/multicast.h b/net/batman-adv/multicast.h index 73b5d45..3a44ebd 100644 --- a/net/batman-adv/multicast.h +++ b/net/batman-adv/multicast.h @@ -50,7 +50,6 @@ void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);

static inline void batadv_mcast_mla_update(struct batadv_priv *bat_priv) { - return; }

static inline enum batadv_forw_mode @@ -67,12 +66,10 @@ static inline int batadv_mcast_init(struct batadv_priv *bat_priv)

static inline void batadv_mcast_free(struct batadv_priv *bat_priv) { - return; }

static inline void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node) { - return; }

#endif /* CONFIG_BATMAN_ADV_MCAST */