| Message ID | 1401343536-20361-1-git-send-email-varkab@cdac.in |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Varka, On Thu, May 29, 2014 at 11:35:35AM +0530, Varka Bhadram wrote: > forgot to use devm_* for spi buff. > sorry for that. > > -Varka Bhadram > > Signed-off-by: Varka Bhadram <varkab@cdac.in> > --- > drivers/net/ieee802154/mrf24j40.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index 78a6552..90aed9b 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c > @@ -618,10 +618,10 @@ static int mrf24j40_probe(struct spi_device *spi) > > printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq); > > - devrec = kzalloc(sizeof(struct mrf24j40), GFP_KERNEL); > + devrec = devm_kzalloc(&spi->dev, sizeof(struct mrf24j40), GFP_KERNEL); > if (!devrec) > goto err_devrec; > - devrec->buf = kzalloc(3, GFP_KERNEL); > + devrec->buf = devm_kzalloc(&spi->dev, 3, GFP_KERNEL); > if (!devrec->buf) > goto err_buf; > > @@ -676,12 +676,13 @@ static int mrf24j40_probe(struct spi_device *spi) > val &= ~0x3; /* Clear RX mode (normal) */ > write_short_reg(devrec, REG_RXMCR, val); > > - ret = request_threaded_irq(spi->irq, > - NULL, > - mrf24j40_isr, > - IRQF_TRIGGER_LOW|IRQF_ONESHOT, > - dev_name(&spi->dev), > - devrec); > + ret = devm_request_threaded_irq(&spi->dev, > + spi->irq, > + NULL, > + mrf24j40_isr, > + IRQF_TRIGGER_LOW|IRQF_ONESHOT, > + dev_name(&spi->dev), > + devrec); > when using devm_* it's also freed when the probe function failed, so you can also remove the error path handling. err_alloc_dev: kfree(devrec->buf); err_buf: kfree(devrec); and so on... - Alex -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 78a6552..90aed9b 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -618,10 +618,10 @@ static int mrf24j40_probe(struct spi_device *spi) printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq); - devrec = kzalloc(sizeof(struct mrf24j40), GFP_KERNEL); + devrec = devm_kzalloc(&spi->dev, sizeof(struct mrf24j40), GFP_KERNEL); if (!devrec) goto err_devrec; - devrec->buf = kzalloc(3, GFP_KERNEL); + devrec->buf = devm_kzalloc(&spi->dev, 3, GFP_KERNEL); if (!devrec->buf) goto err_buf; @@ -676,12 +676,13 @@ static int mrf24j40_probe(struct spi_device *spi) val &= ~0x3; /* Clear RX mode (normal) */ write_short_reg(devrec, REG_RXMCR, val); - ret = request_threaded_irq(spi->irq, - NULL, - mrf24j40_isr, - IRQF_TRIGGER_LOW|IRQF_ONESHOT, - dev_name(&spi->dev), - devrec); + ret = devm_request_threaded_irq(&spi->dev, + spi->irq, + NULL, + mrf24j40_isr, + IRQF_TRIGGER_LOW|IRQF_ONESHOT, + dev_name(&spi->dev), + devrec); if (ret) { dev_err(printdev(devrec), "Unable to get IRQ"); @@ -709,15 +710,11 @@ static int mrf24j40_remove(struct spi_device *spi) dev_dbg(printdev(devrec), "remove\n"); - free_irq(spi->irq, devrec); ieee802154_unregister_device(devrec->dev); ieee802154_free_device(devrec->dev); /* TODO: Will ieee802154_free_device() wait until ->xmit() is * complete? */ - /* Clean up the SPI stuff. */ - kfree(devrec->buf); - kfree(devrec); return 0; }
forgot to use devm_* for spi buff. sorry for that. -Varka Bhadram Signed-off-by: Varka Bhadram <varkab@cdac.in> --- drivers/net/ieee802154/mrf24j40.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)