From patchwork Thu May 29 10:27:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 353721 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 6E0BF1400CF for ; Thu, 29 May 2014 20:28:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756916AbaE2K2g (ORCPT ); Thu, 29 May 2014 06:28:36 -0400 Received: from mail-pb0-f50.google.com ([209.85.160.50]:54218 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756207AbaE2K2e (ORCPT ); Thu, 29 May 2014 06:28:34 -0400 Received: by mail-pb0-f50.google.com with SMTP id ma3so149705pbc.37 for ; Thu, 29 May 2014 03:28:34 -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=G6Ny8R9sDlzY75jqSChEcxWLlUt2koptEOhx3W99lVA=; b=KrmbaQr/zTlHbSXaaGY7VAdhOAGoFUXFkHqo78NUviKe4U2Xjw+3wdiUBRigruFeLZ 7LEJ6GnkOLsjIQUwWnWpDL01sCK4ARMS7dHUJNT4qTwospvLIFoBS8lh+6U8w2ctnynf 5dfoLvjhC/NeytzlYHL28gjq0vaAd1YJLAXZ8/Pu/DkGIOOEZrBZxKTRt8agRI59tQQQ pMOwt9HgFathQi3O6j7MhDNRRxD/+OWZNyiNpImmJBMboLdt0RCGGrIFvkcuwvucCBpu NfIUTUbXnv5a9DEtmkRAq/p6jumeNtknpx9lDdCg+Vi3LcicM6PqfMWMaFXw5m/4IKSJ xYIA== X-Received: by 10.66.190.232 with SMTP id gt8mr7456927pac.25.1401359314471; Thu, 29 May 2014 03:28:34 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id ih6sm515014pbc.22.2014.05.29.03.28.30 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 May 2014 03:28:33 -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 v3] mrf24j40: added device managed APIs Date: Thu, 29 May 2014 15:57:38 +0530 Message-Id: <1401359258-7247-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 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 --- 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; } @@ -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; }