Small patchset addressing break redundancy on net branch
(suggested by Joe Perches).
Fabian Frederick (16):
packet: remove unnecessary break after return
tipc: remove unnecessary break after return
9P: remove unnecessary break after return
af_iucv: remove unnecessary break after goto
netlabel: remove unnecessary break after goto
pktgen: remove unnecessary break after goto
drop_monitor: remove unnecessary break after return
mac80211: remove unnecessary break after return
af_key: remove unnecessary break after return
netfilter: remove unnecessary break after return
ipv6: remove unnecessary break after return
NFC: remove unnecessary break after goto
caif: remove unnecessary break after goto
irda: remove unnecessary break after return
ieee802154: remove unnecessary break after goto
net: sctp: remove unnecessary break after return/goto
net/9p/client.c | 1 -
net/caif/cfctrl.c | 1 -
net/core/drop_monitor.c | 2 --
net/core/pktgen.c | 1 -
net/ieee802154/6lowpan_iphc.c | 1 -
net/ipv6/ipv6_sockglue.c | 1 -
net/ipv6/netfilter/ip6t_ipv6header.c | 1 -
net/irda/af_irda.c | 1 -
net/irda/irlan/irlan_common.c | 1 -
net/iucv/af_iucv.c | 1 -
net/key/af_key.c | 3 ---
net/mac80211/mesh_hwmp.c | 1 -
net/netlabel/netlabel_kapi.c | 1 -
net/nfc/digital_dep.c | 2 --
net/packet/af_packet.c | 2 --
net/sctp/outqueue.c | 1 -
net/sctp/sm_statefuns.c | 4 ----
net/tipc/socket.c | 1 -
18 files changed, 26 deletions(-)
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/packet/af_packet.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index b85c67c..614ca91 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3071,10 +3071,8 @@ static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i,
break;
case PACKET_MR_PROMISC:
return dev_set_promiscuity(dev, what);
- break;
case PACKET_MR_ALLMULTI:
return dev_set_allmulti(dev, what);
- break;
case PACKET_MR_UNICAST:
if (i->alen != dev->addr_len)
return -EINVAL;
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/tipc/socket.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index ef04755..857f1dfb 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1952,7 +1952,6 @@ int tipc_ioctl(struct socket *sk, unsigned int cmd, unsigned long arg)
return 0;
}
return -EADDRNOTAVAIL;
- break;
default:
return -ENOIOCTLCMD;
}
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/core/pktgen.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index fc17a9d..8d77f04 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -802,7 +802,6 @@ static int strn_len(const char __user * user_buffer, unsigned int maxlen)
case '\t':
case ' ':
goto done_str;
- break;
default:
break;
}
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/mac80211/mesh_hwmp.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index 94758b9..214e63b 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -157,7 +157,6 @@ static int mesh_path_sel_frame_tx(enum mpath_frame_type action, u8 flags,
default:
kfree_skb(skb);
return -ENOTSUPP;
- break;
}
*pos++ = ie_len;
*pos++ = flags;
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/key/af_key.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net/key/af_key.c b/net/key/af_key.c
index ba2a2f9..1847ec4 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -405,7 +405,6 @@ static int verify_address_len(const void *p)
* XXX When it can, remove this -EINVAL. -DaveM
*/
return -EINVAL;
- break;
}
return 0;
@@ -536,7 +535,6 @@ pfkey_satype2proto(uint8_t satype)
return IPPROTO_ESP;
case SADB_X_SATYPE_IPCOMP:
return IPPROTO_COMP;
- break;
default:
return 0;
}
@@ -553,7 +551,6 @@ pfkey_proto2satype(uint16_t proto)
return SADB_SATYPE_ESP;
case IPPROTO_COMP:
return SADB_X_SATYPE_IPCOMP;
- break;
default:
return 0;
}
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/iucv/af_iucv.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 7a95fa4..d79f5fb 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1103,7 +1103,6 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
default:
err = -EINVAL;
goto out;
- break;
}
}
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/core/drop_monitor.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index e70301e..50f9a9d 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -289,10 +289,8 @@ static int net_dm_cmd_trace(struct sk_buff *skb,
switch (info->genlhdr->cmd) {
case NET_DM_CMD_START:
return set_all_monitor_traces(TRACE_ON);
- break;
case NET_DM_CMD_STOP:
return set_all_monitor_traces(TRACE_OFF);
- break;
}
return -ENOTSUPP;
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/netlabel/netlabel_kapi.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 3045a96..fe9415e 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -170,7 +170,6 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
#endif /* IPv6 */
default:
goto cfg_unlbl_map_add_failure;
- break;
}
entry->def.addrsel = addrmap;
--
1.8.4.5
Signed-off-by: Fabian Frederick <[email protected]>
---
net/9p/client.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/net/9p/client.c b/net/9p/client.c
index 0004cba..e86a9be 100644
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -959,7 +959,6 @@ static int p9_client_version(struct p9_client *c)
break;
default:
return -EINVAL;
- break;
}
if (IS_ERR(req))
--
1.8.4.5
On Monday, July 14, 2014 06:30:55 PM Fabian Frederick wrote:
> Signed-off-by: Fabian Frederick <[email protected]>
Acked-by: Paul Moore <[email protected]>
> ---
> net/netlabel/netlabel_kapi.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
> index 3045a96..fe9415e 100644
> --- a/net/netlabel/netlabel_kapi.c
> +++ b/net/netlabel/netlabel_kapi.c
> @@ -170,7 +170,6 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
> #endif /* IPv6 */
> default:
> goto cfg_unlbl_map_add_failure;
> - break;
> }
>
> entry->def.addrsel = addrmap;
--
paul moore
http://www.paul-moore.com
From: Fabian Frederick <[email protected]>
Date: Mon, 14 Jul 2014 18:30:50 +0200
> Small patchset addressing break redundancy on net branch
> (suggested by Joe Perches).
Series applied, thanks Fabian.