From patchwork Wed Jun 11 04:34:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 358484 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AB1951400B2 for ; Wed, 11 Jun 2014 14:35:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755376AbaFKEfq (ORCPT ); Wed, 11 Jun 2014 00:35:46 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:61682 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750848AbaFKEfo (ORCPT ); Wed, 11 Jun 2014 00:35:44 -0400 Received: by mail-pa0-f41.google.com with SMTP id kq14so1466302pab.0 for ; Tue, 10 Jun 2014 21:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=aHjx3yvPT2rAP+9C/Min0Yo9e5B1mpxKar4D89P9J7o=; b=YIQH5KZGpEq5O8va2PLQx48h0iGxh6N+/dkumFD/E49cDt6NvOoi9RCETO8e1vWF/j 5ktgT+rkCb7QJh/cvCdlDWkXKs+U43yGjKX8unuJVDllkZc4Z8hrCl2EJvFFqiSKf0nb kLcp09PwPSXCdQ2jDMeUlkR+XgUEOCkNIlwax7iFyV+8DDGry3OHIFzUr6JfB1RHGG7a aNlN41VaC17eUd9ha9Ll5Y2W8X0+/JHjGd5kCElQ0ICVVWqrFACVqXWs9yZIPTR5j+bq kfFRMx4XXALw2l1Edrq7ywxdEr91EC7s882pUAfcGdhVymNzzcn6N8yUDFemtT9zpZwA oMwg== X-Received: by 10.68.135.100 with SMTP id pr4mr1964222pbb.46.1402461343589; Tue, 10 Jun 2014 21:35:43 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id om6sm72405878pbc.43.2014.06.10.21.35.40 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 21:35:42 -0700 (PDT) From: Varka Bhadram X-Google-Original-From: Varka Bhadram To: netdev@vger.kernel.org Cc: linux-zigbee-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, alex.bluesman.smirnov@gmail.com, dbaryshkov@gmail.com, Varka Bhadram Subject: [net-next PATCH] mrf24j40: add device managed APIs Date: Wed, 11 Jun 2014 10:04:44 +0530 Message-Id: <1402461284-8435-1-git-send-email-varkab@cdac.in> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org adds the device managed APIs so that no need worry about freeing the resources. Signed-off-by: Varka Bhadram --- drivers/net/ieee802154/mrf24j40.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 78a6552..4048062 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) @@ -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,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"); @@ -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; }