From patchwork Thu May 29 06:05:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 353658 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 A31CA140094 for ; Thu, 29 May 2014 16:06:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756697AbaE2GGc (ORCPT ); Thu, 29 May 2014 02:06:32 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:44214 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756053AbaE2GGa (ORCPT ); Thu, 29 May 2014 02:06:30 -0400 Received: by mail-pa0-f54.google.com with SMTP id bj1so12331995pad.13 for ; Wed, 28 May 2014 23:06:30 -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=2XGNtn+au6FwnJOyjK5tjHTEqzU+Vakd5VC/P84k160=; b=Zn36mdBOSlYAqBXjWjuHd2mCSCWBt89z5mXwiD7Fv4cvoL9JltbO3u+phCJXUHLNlg VWqbE2UDbQ9zyxoLzBn1bAdmoaOvWxNpSrJKpJMksPzUZoNk2CMbjtHbi8/agzNfOtn/ qkLTKIJcW0yd0bUnC5Qo803bk2ZD2xB7rrOQq0xXLl+rwyBnhn0MuAlBSWKR4XjDyDcW Yepn2EvSmTeaV2/OMn+JuHdfeppe18x8/M8pez7/Lihw1JhZ3RWm2KeHNdcIqXxNrFNl K0juKtWrjAHFwKaggKUlZbr7AQKDkS09SFKGSgoAwujsBQ37BoQyUd9wOzfNN6cUiJER SpLQ== X-Received: by 10.66.120.201 with SMTP id le9mr5928796pab.98.1401343590365; Wed, 28 May 2014 23:06:30 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id vf9sm31435928pbc.94.2014.05.28.23.06.26 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 28 May 2014 23:06:29 -0700 (PDT) From: Varka Bhadram X-Google-Original-From: Varka Bhadram To: alan@signal11.us Cc: alex.bluesman.smirnov@gmail.com, dbaryshkov@gmail.com, linux-zigbee-devel@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, davem@davemloft.net, alex.aing@gmail.com, Varka Bhadram Subject: [PATCH net-next v2] mrf24j40: add managed API's provided by device layer Date: Thu, 29 May 2014 11:35:35 +0530 Message-Id: <1401343536-20361-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 forgot to use devm_* for spi buff. sorry for that. -Varka Bhadram Signed-off-by: Varka Bhadram --- 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); 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; }