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 <[email protected]>
Acked-by: Julia Lawall <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/cw1200/cw1200_spi.c b/drivers/net/wireless/cw1200/cw1200_spi.c
index 40078f5f932ec6b1ea3a26af5453f2bc5d2206ec..964b64ab7fe3a10aed8024f79abe6a23df6afb38 100644 (file)
--- a/drivers/net/wireless/cw1200/cw1200_spi.c
+++ b/drivers/net/wireless/cw1200/cw1200_spi.c
@@ -398,7 +398,7 @@ static int cw1200_spi_probe(struct spi_device *func)
                return -1;
        }
 
-       self = kzalloc(sizeof(*self), GFP_KERNEL);
+       self = devm_kzalloc(&func->dev, sizeof(*self), GFP_KERNEL);
        if (!self) {
                pr_err("Can't allocate SPI hwbus_priv.");
                return -ENOMEM;
@@ -424,7 +424,6 @@ static int cw1200_spi_probe(struct spi_device *func)
        if (status) {
                cw1200_spi_irq_unsubscribe(self);
                cw1200_spi_off(plat_data);
-               kfree(self);
        }
 
        return status;
@@ -441,7 +440,6 @@ static int cw1200_spi_disconnect(struct spi_device *func)
                        cw1200_core_release(self->core);
                        self->core = NULL;
                }
-               kfree(self);
        }
        cw1200_spi_off(dev_get_platdata(&func->dev));