[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1360570878-23107-1-git-send-email-coelho@ti.com>
Date: Mon, 11 Feb 2013 10:21:18 +0200
From: Luciano Coelho <coelho@...com>
To: <linville@...driver.com>, <sfr@...b.auug.org.au>
CC: <joe@...ches.com>, <linux-next@...r.kernel.org>,
<linux-kernel@...r.kernel.org>, <davem@...emloft.net>,
<netdev@...r.kernel.org>
Subject: [PATCH v2] wlcore: remove newly introduced alloc/OOM messages
In commit 0d2e7a5c (wireless: Remove unnecessary alloc/OOM messages,
alloc cleanups) OOM messages after alloc were removed from the wlcore
modules.
Commit afb43e6d (wlcore: remove if_ops from platform_data)
reintroduced a couple of those. This patch removes them.
Signed-off-by: Luciano Coelho <coelho@...com>
---
John,
Please ignore my previous patch. Now this should be right. ;)
Can you apply this directly on wireless-next after you process my
latest pull-request?
Thanks!
Sorry for my monday-morning-with-too-little-caffeinne-in-the-blood
screw up. ;)
drivers/net/wireless/ti/wlcore/sdio.c | 4 +---
drivers/net/wireless/ti/wlcore/spi.c | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ti/wlcore/sdio.c b/drivers/net/wireless/ti/wlcore/sdio.c
index 198028d..29ef249 100644
--- a/drivers/net/wireless/ti/wlcore/sdio.c
+++ b/drivers/net/wireless/ti/wlcore/sdio.c
@@ -229,10 +229,8 @@ static int wl1271_probe(struct sdio_func *func,
return -ENODEV;
pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL);
- if (!pdev_data) {
- dev_err(&func->dev, "can't allocate platdev_data\n");
+ if (!pdev_data)
goto out;
- }
pdev_data->if_ops = &sdio_ops;
diff --git a/drivers/net/wireless/ti/wlcore/spi.c b/drivers/net/wireless/ti/wlcore/spi.c
index 5ad2e10..e264478 100644
--- a/drivers/net/wireless/ti/wlcore/spi.c
+++ b/drivers/net/wireless/ti/wlcore/spi.c
@@ -332,10 +332,8 @@ static int wl1271_probe(struct spi_device *spi)
int ret = -ENOMEM;
pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL);
- if (!pdev_data) {
- dev_err(&spi->dev, "can't allocate platdev_data\n");
+ if (!pdev_data)
goto out;
- }
pdev_data->pdata = spi->dev.platform_data;
if (!pdev_data->pdata) {
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists