Patchwork [v2] wlcore: remove newly introduced alloc/OOM messages

login
register
mail settings
Submitter Luciano Coelho
Date Feb. 11, 2013, 8:21 a.m.
Message ID <1360570878-23107-1-git-send-email-coelho@ti.com>
Download mbox | patch
Permalink /patch/219547/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Luciano Coelho - Feb. 11, 2013, 8:21 a.m.
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@ti.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(-)
Felipe Balbi - Feb. 11, 2013, 8:24 a.m.
On Mon, Feb 11, 2013 at 10:21:18AM +0200, Luciano Coelho wrote:
> 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@ti.com>

looks good now :-)

Reviewed-by: Felipe Balbi <balbi@ti.com>

Patch

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) {