batman-adv: checkpatch - else is not generally useful after a break or return

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>

4 files changed, 5 insertions, 9 deletions

diff --git a/net/batman-adv/bitarray.h b/net/batman-adv/bitarray.h
index cc2407351d36..2acaafe60188 100644
--- a/net/batman-adv/bitarray.h
+++ b/net/batman-adv/bitarray.h
@@ -29,8 +29,7 @@ static inline int batadv_test_bit(const unsigned long *seq_bits,
         diff = last_seqno - curr_seqno;
         if (diff < 0 || diff >= BATADV_TQ_LOCAL_WINDOW_SIZE)
                 return 0;
-        else
-                return test_bit(diff, seq_bits) != 0;
+        return test_bit(diff, seq_bits) != 0;
 }
 
 /* turn corresponding bit on, so we can remember that we got the packet */
diff --git a/net/batman-adv/fragmentation.h b/net/batman-adv/fragmentation.h
index 5d7a0e66a22b..d848cf6676a2 100644
--- a/net/batman-adv/fragmentation.h
+++ b/net/batman-adv/fragmentation.h
@@ -41,8 +41,7 @@ batadv_frag_check_entry(struct batadv_frag_table_entry *frags_entry)
         if (!hlist_empty(&frags_entry->head) &&
             batadv_has_timed_out(frags_entry->timestamp, BATADV_FRAG_TIMEOUT))
                 return true;
-        else
-                return false;
+        return false;
 }
 
 #endif /* _NET_BATMAN_ADV_FRAGMENTATION_H_ */
diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
index fab47f1f3ef9..127cc4d7380a 100644
--- a/net/batman-adv/network-coding.c
+++ b/net/batman-adv/network-coding.c
@@ -1212,8 +1212,7 @@ static bool batadv_nc_skb_coding_possible(struct sk_buff *skb,
 {
         if (BATADV_SKB_CB(skb)->decoded && !batadv_compare_eth(dst, src))
                 return false;
-        else
-                return true;
+        return true;
 }
 
 /**
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 5f59e7f899a0..38a804e1db0a 100644
--- a/net/batman-adv/translation-table.c
+++ b/net/batman-adv/translation-table.c
@@ -2769,9 +2769,8 @@ static bool batadv_send_tt_response(struct batadv_priv *bat_priv,
 {
         if (batadv_is_my_mac(bat_priv, req_dst))
                 return batadv_send_my_tt_response(bat_priv, tt_data, req_src);
-        else
-                return batadv_send_other_tt_response(bat_priv, tt_data,
-                                                     req_src, req_dst);
+        return batadv_send_other_tt_response(bat_priv, tt_data, req_src,
+                                             req_dst);
 }
 
 static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,