summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ti
diff options
context:
space:
mode:
authorLuciano Coelho <coelho@ti.com>2013-02-11 10:21:18 +0200
committerJohn W. Linville <linville@tuxdriver.com>2013-02-11 15:34:58 -0500
commitf1045f5e1f4f7d94f4e3a9600e3a3c3eec2650ec (patch)
tree260535ccbeaefed44d9079a11e37d663d6c1eff1 /drivers/net/wireless/ti
parentd9d76a045f2883f2e6cf00a43cb79b2e5a8db323 (diff)
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@ti.com> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r--drivers/net/wireless/ti/wlcore/sdio.c4
-rw-r--r--drivers/net/wireless/ti/wlcore/spi.c4
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 198028df6f4b..29ef2492951f 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 5ad2e100e59b..e26447832683 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) {