UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

cw1200: Introduce the use of devm_kzalloc 

This patch introduces the use of devm_kzalloc and does away with the
kfrees in the probe and remove functions.

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-02 20:22:46 +05:30 committed by John W. Linville
parent 6040aa70c3
commit 26c0604628
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/cw1200/cw1200_spi.c
View File

@ -398,7 +398,7 @@ static int cw1200_spi_probe(struct spi_device *func)
return -1; return -1;
} }
self = kzalloc(sizeof(*self), GFP_KERNEL); self = devm_kzalloc(&func->dev, sizeof(*self), GFP_KERNEL);
if (!self) { if (!self) {
pr_err("Can't allocate SPI hwbus_priv."); pr_err("Can't allocate SPI hwbus_priv.");
return -ENOMEM; return -ENOMEM;
@ -424,7 +424,6 @@ static int cw1200_spi_probe(struct spi_device *func)
if (status) { if (status) {
cw1200_spi_irq_unsubscribe(self); cw1200_spi_irq_unsubscribe(self);
cw1200_spi_off(plat_data); cw1200_spi_off(plat_data);
kfree(self);
} }
return status; return status;
@ -441,7 +440,6 @@ static int cw1200_spi_disconnect(struct spi_device *func)
cw1200_core_release(self->core); cw1200_core_release(self->core);
self->core = NULL; self->core = NULL;
} }
kfree(self);
} }
cw1200_spi_off(dev_get_platdata(&func->dev)); cw1200_spi_off(dev_get_platdata(&func->dev));