diff options
author | Joe Perches <joe@perches.com> | 2013-02-03 12:28:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-04 13:22:34 -0500 |
commit | 0d2e7a5c608063f72048899d20505c2ee130566c (patch) | |
tree | 4eae4acaf7c04bb60337389aaef8065c00b1737a /drivers/net/wireless/mwifiex/cfg80211.c | |
parent | 9d11bd1592fba0b9231d3ce8ab61977db7e03e27 (diff) |
wireless: Remove unnecessary alloc/OOM messages, alloc cleanups
alloc failures already get standardized OOM
messages and a dump_stack.
Convert kzalloc's with multiplies to kcalloc.
Convert kmalloc's with multiplies to kmalloc_array.
Remove now unused variables.
Remove unnecessary memset after kzalloc->kcalloc.
Whitespace cleanups for these changes.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mwifiex/cfg80211.c')
-rw-r--r-- | drivers/net/wireless/mwifiex/cfg80211.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c index ab92e799cf75..8ba48192cd2f 100644 --- a/drivers/net/wireless/mwifiex/cfg80211.c +++ b/drivers/net/wireless/mwifiex/cfg80211.c | |||
@@ -1820,10 +1820,8 @@ mwifiex_cfg80211_scan(struct wiphy *wiphy, | |||
1820 | 1820 | ||
1821 | priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), | 1821 | priv->user_scan_cfg = kzalloc(sizeof(struct mwifiex_user_scan_cfg), |
1822 | GFP_KERNEL); | 1822 | GFP_KERNEL); |
1823 | if (!priv->user_scan_cfg) { | 1823 | if (!priv->user_scan_cfg) |
1824 | dev_err(priv->adapter->dev, "failed to alloc scan_req\n"); | ||
1825 | return -ENOMEM; | 1824 | return -ENOMEM; |
1826 | } | ||
1827 | 1825 | ||
1828 | priv->scan_request = request; | 1826 | priv->scan_request = request; |
1829 | 1827 | ||