diff options
| author | Joe Perches <joe@perches.com> | 2012-01-29 12:56:23 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-31 16:20:21 -0500 |
| commit | e404decb0fb017be80552adee894b35307b6c7b4 (patch) | |
| tree | 19b2324328eb1f8cef599f9f164dc9ca6e5699c9 /drivers/net/wireless/mwifiex | |
| parent | 5f3d9cb2962967d9d7e03abb4a7ca275a9a3fea5 (diff) | |
| download | linux-next-e404decb0fb017be80552adee894b35307b6c7b4.tar.gz | |
drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages
alloc failures use dump_stack so emitting an additional
out-of-memory message is an unnecessary duplication.
Remove the allocation failure messages.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
| -rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/mwifiex/sdio.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 405350940a45..f4fbad95d3e3 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -86,10 +86,8 @@ static int mwifiex_pcie_probe(struct pci_dev *pdev, pdev->vendor, pdev->device, pdev->revision); card = kzalloc(sizeof(struct pcie_service_card), GFP_KERNEL); - if (!card) { - pr_err("%s: failed to alloc memory\n", __func__); + if (!card) return -ENOMEM; - } card->dev = pdev; diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index d39d8457f252..835902750231 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c @@ -70,10 +70,8 @@ mwifiex_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) func->vendor, func->device, func->class, func->num); card = kzalloc(sizeof(struct sdio_mmc_card), GFP_KERNEL); - if (!card) { - pr_err("%s: failed to alloc memory\n", __func__); + if (!card) return -ENOMEM; - } card->func = func; |