leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wireless: wlcore: Use devm_kzalloc

Browse Source 
This patch introduces the use of devm_kzalloc and does away with the
kfrees in the probe and remove functions. Also, a couple of labels and
the initial assignment of the ret variable in the probe function are
removed.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Himangi Saraogi 2014-08-07 16:32:45 +05:30 committed by John W. Linville
parent 560ce30872
commit 372e3a8468
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/wireless/ti/wlcore/spi.c
View File

@ -327,23 +327,22 @@ static int wl1271_probe(struct spi_device *spi)
struct wl12xx_spi_glue *glue; struct wl12xx_spi_glue *glue;
struct wlcore_platdev_data pdev_data; struct wlcore_platdev_data pdev_data;
struct resource res[1]; struct resource res[1];
int ret = -ENOMEM; int ret;
memset(&pdev_data, 0x00, sizeof(pdev_data)); memset(&pdev_data, 0x00, sizeof(pdev_data));
pdev_data.pdata = dev_get_platdata(&spi->dev); pdev_data.pdata = dev_get_platdata(&spi->dev);
if (!pdev_data.pdata) { if (!pdev_data.pdata) {
dev_err(&spi->dev, "no platform data\n"); dev_err(&spi->dev, "no platform data\n");
ret = -ENODEV; return -ENODEV;
goto out;
} }
pdev_data.if_ops = &spi_ops; pdev_data.if_ops = &spi_ops;
glue = kzalloc(sizeof(*glue), GFP_KERNEL); glue = devm_kzalloc(&spi->dev, sizeof(*glue), GFP_KERNEL);
if (!glue) { if (!glue) {
dev_err(&spi->dev, "can't allocate glue\n"); dev_err(&spi->dev, "can't allocate glue\n");
goto out; return -ENOMEM;
} }
glue->dev = &spi->dev; glue->dev = &spi->dev;
@ -357,14 +356,13 @@ static int wl1271_probe(struct spi_device *spi)
ret = spi_setup(spi); ret = spi_setup(spi);
if (ret < 0) { if (ret < 0) {
dev_err(glue->dev, "spi_setup failed\n"); dev_err(glue->dev, "spi_setup failed\n");
goto out_free_glue; return ret;
} }
glue->core = platform_device_alloc("wl12xx", PLATFORM_DEVID_AUTO); glue->core = platform_device_alloc("wl12xx", PLATFORM_DEVID_AUTO);
if (!glue->core) { if (!glue->core) {
dev_err(glue->dev, "can't allocate platform_device\n"); dev_err(glue->dev, "can't allocate platform_device\n");
ret = -ENOMEM; return -ENOMEM;
goto out_free_glue;
} }
glue->core->dev.parent = &spi->dev; glue->core->dev.parent = &spi->dev;
@ -398,11 +396,6 @@ static int wl1271_probe(struct spi_device *spi)
out_dev_put: out_dev_put:
platform_device_put(glue->core); platform_device_put(glue->core);
out_free_glue:
kfree(glue);
out:
return ret; return ret;
} }
@ -411,7 +404,6 @@ static int wl1271_remove(struct spi_device *spi)
struct wl12xx_spi_glue *glue = spi_get_drvdata(spi); struct wl12xx_spi_glue *glue = spi_get_drvdata(spi);
platform_device_unregister(glue->core); platform_device_unregister(glue->core);
kfree(glue);
return 0; return 0;
} }