From: Luciano Coelho <coelho@ti•com>
To: linville@tuxdriver•com, sfr@canb•auug.org.au
Cc: joe@perches•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org, davem@davemloft•net,
netdev@vger•kernel.org
Subject: [PATCH v2] wlcore: remove newly introduced alloc/OOM messages
Date: Mon, 11 Feb 2013 10:21:18 +0200 [thread overview]
Message-ID: <1360570878-23107-1-git-send-email-coelho@ti.com> (raw)
In-Reply-To: <1360569218.12803.50.camel@cumari.coelho.fi>
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(-)
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
next prev parent reply other threads:[~2013-02-11 8:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 2:33 linux-next: manual merge of the wireless-next tree with the net-next tree Stephen Rothwell
2013-02-11 2:58 ` Joe Perches
2013-02-11 6:47 ` Luciano Coelho
2013-02-11 7:40 ` Stephen Rothwell
2013-02-11 7:53 ` Luciano Coelho
2013-02-11 8:02 ` [PATCH] wlcore: remove newly introduced alloc/OOM messages Luciano Coelho
2013-02-11 8:06 ` Luciano Coelho
2013-02-11 8:07 ` Joe Perches
2013-02-11 8:07 ` Luciano Coelho
2013-02-11 8:08 ` Felipe Balbi
2013-02-11 8:21 ` Luciano Coelho [this message]
2013-02-11 8:24 ` [PATCH v2] " Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360570878-23107-1-git-send-email-coelho@ti.com \
--to=coelho@ti$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=joe@perches$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox