[PATCH net-next v1] mrf24j40: add managed API's provided by device layer

Hi,
	Previous patch having bug in using managed API's. I fixed that.

Regards,
Varka Bhadram.

Signed-off-by: Varka Bhadram <redacted>
---
 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..f701cdb 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 = 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;
 }
 

-- 
1.7.9.5


------------------------------------------------------------------------------
Time is money. Stop wasting it! Get your web API in 5 minutes.
www.restlet.com/download
http://p.sf.net/sfu/restlet

On Thu, May 29, 2014 at 10:10:21AM +0530, Varka Bhadram wrote:

Hi,
	Previous patch having bug in using managed API's. I fixed that.

Regards,
Varka Bhadram.

Only add relevant commit message here, no need to add 'Hi' and
'Regards'.

Something like ...

"Added devres managed APIs"

devm_kzalloc()

Without this, it should not build at all. So remember to compile test
before sending the patches.

--
Warm regards,
Tushar

Thanks for the suggestions.

I send the v2 patch which uses devm_kzalloc().

Regards,
Varka Bhadram

On Thu, May 29, 2014 at 12:02 PM, Tushar Behera [off-list ref] wrote:

On Thu, May 29, 2014 at 10:10:21AM +0530, Varka Bhadram wrote:

quoted

Hi,
      Previous patch having bug in using managed API's. I fixed that.

Regards,
Varka Bhadram.

Only add relevant commit message here, no need to add 'Hi' and
'Regards'.

Something like ...

"Added devres managed APIs"

quoted

Signed-off-by: Varka Bhadram <redacted>
---
 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..f701cdb 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 = kzalloc(&spi->dev, 3, GFP_KERNEL);

devm_kzalloc()

Without this, it should not build at all. So remember to compile test
before sending the patches.

--
Warm regards,
Tushar