| Message ID | 1401359258-7247-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 03:57:38PM +0530, Varka Bhadram wrote: > changes since v2: > 1. removed unwanted label implementation. > > When we use devm_* APIs ,probe() failed also the memory > will be freed automatically. Thanks to Alex > > -Varka Bhadram > > you should provide a "well" commit msg here. No emotional comments and remove your signature. Look in linux tree and run "git log" for other commit messages. > Signed-off-by: Varka Bhadram <varkab@cdac.in> > --- if you want to thanks somebody here and tell about the changes since v2 you can put it here, after the "---". This will be ignored while applying your patch. > drivers/net/ieee802154/mrf24j40.c | 30 ++++++++++++------------------ > 1 file changed, 12 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index 78a6552..f2b1345 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c - 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
Hi Varka, On Thu, May 29, 2014 at 03:57:38PM +0530, Varka Bhadram wrote: > changes since v2: > 1. removed unwanted label implementation. > > When we use devm_* APIs ,probe() failed also the memory > will be freed automatically. Thanks to Alex > > -Varka Bhadram > > > Signed-off-by: Varka Bhadram <varkab@cdac.in> > --- > drivers/net/ieee802154/mrf24j40.c | 30 ++++++++++++------------------ > 1 file changed, 12 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c > index 78a6552..f2b1345 100644 > --- a/drivers/net/ieee802154/mrf24j40.c > +++ b/drivers/net/ieee802154/mrf24j40.c > @@ -618,12 +618,12 @@ 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); > + goto err_ret; > + devrec->buf = devm_kzalloc(&spi->dev, 3, GFP_KERNEL); > if (!devrec->buf) > - goto err_buf; > + goto err_ret; > > spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */ > if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) > @@ -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"); > @@ -696,10 +697,7 @@ err_read_reg: > err_register_device: > ieee802154_free_device(devrec->dev); > err_alloc_dev: > - kfree(devrec->buf); > -err_buf: > - kfree(devrec); > -err_devrec: > +err_ret: > return ret; > } another point is that you have now two labels for the same jump point. err_alloc_dev: err_ret: - 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..f2b1345 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -618,12 +618,12 @@ 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); + goto err_ret; + devrec->buf = devm_kzalloc(&spi->dev, 3, GFP_KERNEL); if (!devrec->buf) - goto err_buf; + goto err_ret; spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */ if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) @@ -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"); @@ -696,10 +697,7 @@ err_read_reg: err_register_device: ieee802154_free_device(devrec->dev); err_alloc_dev: - kfree(devrec->buf); -err_buf: - kfree(devrec); -err_devrec: +err_ret: return ret; } @@ -709,15 +707,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; }
changes since v2: 1. removed unwanted label implementation. When we use devm_* APIs ,probe() failed also the memory will be freed automatically. Thanks to Alex -Varka Bhadram Signed-off-by: Varka Bhadram <varkab@cdac.in> --- drivers/net/ieee802154/mrf24j40.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)