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>
This commit is contained in:

committed by
David S. Miller

parent
21ce849ba5
commit
a4b770972b
@@ -1015,8 +1015,6 @@ static void e1000_free_desc_rings(struct e1000_adapter *adapter)
|
||||
txdr->buffer_info = NULL;
|
||||
kfree(rxdr->buffer_info);
|
||||
rxdr->buffer_info = NULL;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static int e1000_setup_desc_rings(struct e1000_adapter *adapter)
|
||||
@@ -1711,8 +1709,6 @@ static void e1000_get_wol(struct net_device *netdev,
|
||||
wol->wolopts |= WAKE_BCAST;
|
||||
if (adapter->wol & E1000_WUFC_MAG)
|
||||
wol->wolopts |= WAKE_MAGIC;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static int e1000_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
|
||||
|
@@ -2546,8 +2546,6 @@ set_itr_now:
|
||||
adapter->itr = new_itr;
|
||||
ew32(ITR, 1000000000 / (new_itr * 256));
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
#define E1000_TX_FLAGS_CSUM 0x00000001
|
||||
|
Reference in New Issue
Block a user