aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ehea
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-05-14 03:19:28 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-14 03:19:28 -0400
commita4b770972b8f819e408d7cc3ae9637e15bff62f6 (patch)
tree62e3c413b084c106d750cf6cc0701709cde30100 /drivers/net/ehea
parent21ce849ba5cc178740c6532ba3dded852296ad91 (diff)
drivers/net: Remove unnecessary returns from void function()s
This patch removes from drivers/net/ all the unnecessary return; statements that precede the last closing brace of void functions. It does not remove the returns that are immediately preceded by a label as gcc doesn't like that. It also does not remove null void functions with return. Done via: $ grep -rP --include=*.[ch] -l "return;\n}" net/ | \ xargs perl -i -e 'local $/ ; while (<>) { s/\n[ \t\n]+return;\n}/\n}/g; print; }' with some cleanups by hand. Compile tested x86 allmodconfig only. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ehea')
-rw-r--r--drivers/net/ehea/ehea_main.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 33a41e29ec83..e8a8ccfedac6 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -1881,7 +1881,6 @@ static void ehea_promiscuous(struct net_device *dev, int enable)
1881 port->promisc = enable; 1881 port->promisc = enable;
1882out: 1882out:
1883 free_page((unsigned long)cb7); 1883 free_page((unsigned long)cb7);
1884 return;
1885} 1884}
1886 1885
1887static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr, 1886static u64 ehea_multicast_reg_helper(struct ehea_port *port, u64 mc_mac_addr,
@@ -2025,7 +2024,6 @@ static void ehea_set_multicast_list(struct net_device *dev)
2025 } 2024 }
2026out: 2025out:
2027 ehea_update_bcmc_registrations(); 2026 ehea_update_bcmc_registrations();
2028 return;
2029} 2027}
2030 2028
2031static int ehea_change_mtu(struct net_device *dev, int new_mtu) 2029static int ehea_change_mtu(struct net_device *dev, int new_mtu)
@@ -2338,7 +2336,6 @@ static void ehea_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
2338 ehea_error("modify_ehea_port failed"); 2336 ehea_error("modify_ehea_port failed");
2339out: 2337out:
2340 free_page((unsigned long)cb1); 2338 free_page((unsigned long)cb1);
2341 return;
2342} 2339}
2343 2340
2344int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp) 2341int ehea_activate_qp(struct ehea_adapter *adapter, struct ehea_qp *qp)
@@ -2881,7 +2878,6 @@ static void ehea_reset_port(struct work_struct *work)
2881 netif_wake_queue(dev); 2878 netif_wake_queue(dev);
2882out: 2879out:
2883 mutex_unlock(&port->port_lock); 2880 mutex_unlock(&port->port_lock);
2884 return;
2885} 2881}
2886 2882
2887static void ehea_rereg_mrs(struct work_struct *work) 2883static void ehea_rereg_mrs(struct work_struct *work)