Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aaf43f5 authored by Varka Bhadram's avatar Varka Bhadram Committed by David S. Miller
Browse files

mrf24j40: add device managed APIs 



adds the device managed APIs so that no need worry about
freeing the resources.

Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6479449

drivers/net/ieee802154/mrf24j40.c

+13 −20
Original line number Diff line number Diff line
@@ -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)
@@ -638,7 +638,7 @@ static int mrf24j40_probe(struct spi_device *spi) 


	devrec->dev = ieee802154_alloc_device(0, &mrf24j40_ops);

	if (!devrec->dev)

		goto err_alloc_dev;

		goto err_ret;



	devrec->dev->priv = devrec;

	devrec->dev->parent = &devrec->spi->dev;
@@ -676,7 +676,8 @@ 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,

	ret = devm_request_threaded_irq(&spi->dev,

					spi->irq,

					NULL,

					mrf24j40_isr,

					IRQF_TRIGGER_LOW|IRQF_ONESHOT,
@@ -695,11 +696,7 @@ err_read_reg: 
	ieee802154_unregister_device(devrec->dev);

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 +706,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;

}