From: Chad Dupuis <cdupuis@redhat.com> Date: Tue, 3 Aug 2010 13:52:15 -0400 Subject: [net] netxen: remove unnecessary returns Message-id: <20100803134931.2239.60931.sendpatchset@localhost.localdomain> Patchwork-id: 27342 O-Subject: [RHEL 5.6 PATCH 40/44] drivers/net: Remove unnecessary returns from void function()s Bugzilla: 562937 RH-Acked-by: David S. Miller <davem@redhat.com> RH-Acked-by: Neil Horman <nhorman@redhat.com> Bugzilla ======== 562937 Upstream Status =============== net-2.6 commit id a4b770972b8f819e408d7cc3ae9637e15bff62f6 Description =========== >From 9ed54699edebd7edd40f69ff20804c897e0ca88e Mon Sep 17 00:00:00 2001 From: Joe Perches <joe@perches.com> Date: Fri, 14 May 2010 00:19:28 -0700 Subject: [PATCH] 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> diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index f377196..920c694 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -1901,5 +1901,4 @@ netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, void netxen_nic_clear_stats(struct netxen_adapter *adapter) { memset(&adapter->stats, 0, sizeof(adapter->stats)); - return; } diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 018338d..d555d46 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -2822,7 +2822,6 @@ netxen_config_indev_addr(struct net_device *dev, unsigned long event) } endfor_ifa(indev); in_dev_put(indev); - return; } static int netxen_netdev_event(struct notifier_block *this,