From patchwork Fri Jun 13 18:03:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himangi Saraogi X-Patchwork-Id: 359583 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 5980D140086 for ; Sat, 14 Jun 2014 04:04:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751183AbaFMSEE (ORCPT ); Fri, 13 Jun 2014 14:04:04 -0400 Received: from mail-pb0-f44.google.com ([209.85.160.44]:57374 "EHLO mail-pb0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751044AbaFMSED (ORCPT ); Fri, 13 Jun 2014 14:04:03 -0400 Received: by mail-pb0-f44.google.com with SMTP id md12so1530095pbc.3 for ; Fri, 13 Jun 2014 11:04:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=xLe2ZyB/Pu+Nj34Hr3i0w4P22KTYkLfjz/R87q0XBSE=; b=DdK2qWUZeJnhDdQ+H97XKQL88Fae+Bv8fMnOTHJemgJKt2NkqL4SZ2Zp+ancWXSl4Z I++K/lzel08HvIyF7u70+zXkWQ02QTALPwrTgA9pK35mthcOrf3jusfdUcp+67E4EdJq LzleiI0MPD1V8uquczgKwtDo3UVhXdk8ve2ICrorWDGIT0quQ5yxeKivmjgtHN8flRZK +tzNYVexyzzQBehY50ZXKEaTgMv5gR9k3dFj9aSmGZ/zZk3WfqBnJE+ay9CaaIXG6KLX +oUmENJEvzw2jz3LrWfFyI6A+2jG9odExID7PCCGhoTaaYDFhe6+SJbprFEiC60cMveC hd8g== X-Received: by 10.68.231.196 with SMTP id ti4mr5371222pbc.48.1402682642045; Fri, 13 Jun 2014 11:04:02 -0700 (PDT) Received: from localhost ([122.178.72.156]) by mx.google.com with ESMTPSA id cz3sm4775594pbc.9.2014.06.13.11.03.59 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 13 Jun 2014 11:04:01 -0700 (PDT) Date: Fri, 13 Jun 2014 23:33:56 +0530 From: Himangi Saraogi To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: julia.lawall@lip6.fr Subject: [PATCH v2] net/nxp/lpc_eth: use devm_ functions Message-ID: <20140613180356.GA8582@himangi-Dell> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The various devm_ functions allocate memory that is released when a driver detaches. This patch uses dmam_alloc_coherent, devm_ioremap devm_clk_get etc. for data that is allocated in the probe function of platform device and is only freed in the remove function. The corresponding free functions are removed and many labels are done away with. Signed-off-by: Himangi Saraogi Acked-by: Julia Lawall --- v2: undo use of devm_request_irq Not compile tested To send to: netdev@vger.kernel.org,linux-kernel@vger.kernel.org drivers/net/ethernet/nxp/lpc_eth.c | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index 422d9b5..35bdbad9 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c @@ -1350,7 +1350,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) ndev->irq = irq; /* Get clock for the device */ - pldat->clk = clk_get(&pdev->dev, NULL); + pldat->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pldat->clk)) { dev_err(&pdev->dev, "error getting clock.\n"); ret = PTR_ERR(pldat->clk); @@ -1361,7 +1361,8 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) __lpc_eth_clock_enable(pldat, true); /* Map IO space */ - pldat->net_base = ioremap(res->start, res->end - res->start + 1); + pldat->net_base = devm_ioremap(&pdev->dev, res->start, + resource_size(res)); if (!pldat->net_base) { dev_err(&pdev->dev, "failed to map registers\n"); ret = -ENOMEM; @@ -1371,7 +1372,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) ndev->name, ndev); if (ret) { dev_err(&pdev->dev, "error requesting interrupt.\n"); - goto err_out_iounmap; + goto err_out_disable_clocks; } /* Fill in the fields of the device structure with ethernet values. */ @@ -1407,9 +1408,9 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) /* Allocate a chunk of memory for the DMA ethernet buffers and descriptors */ pldat->dma_buff_base_v = - dma_alloc_coherent(&pldat->pdev->dev, - pldat->dma_buff_size, &dma_handle, - GFP_KERNEL); + dmam_alloc_coherent(&pldat->pdev->dev, + pldat->dma_buff_size, &dma_handle, + GFP_KERNEL); if (pldat->dma_buff_base_v == NULL) { ret = -ENOMEM; goto err_out_free_irq; @@ -1465,7 +1466,7 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) ret = register_netdev(ndev); if (ret) { dev_err(&pdev->dev, "Cannot register net device, aborting.\n"); - goto err_out_dma_unmap; + goto err_out_free_irq; } platform_set_drvdata(pdev, ndev); @@ -1485,19 +1486,10 @@ static int lpc_eth_drv_probe(struct platform_device *pdev) err_out_unregister_netdev: unregister_netdev(ndev); -err_out_dma_unmap: - if (!use_iram_for_net(&pldat->pdev->dev) || - pldat->dma_buff_size > lpc32xx_return_iram_size()) - dma_free_coherent(&pldat->pdev->dev, pldat->dma_buff_size, - pldat->dma_buff_base_v, - pldat->dma_buff_base_p); err_out_free_irq: free_irq(ndev->irq, ndev); -err_out_iounmap: - iounmap(pldat->net_base); err_out_disable_clocks: clk_disable(pldat->clk); - clk_put(pldat->clk); err_out_free_dev: free_netdev(ndev); err_exit: @@ -1512,17 +1504,10 @@ static int lpc_eth_drv_remove(struct platform_device *pdev) unregister_netdev(ndev); - if (!use_iram_for_net(&pldat->pdev->dev) || - pldat->dma_buff_size > lpc32xx_return_iram_size()) - dma_free_coherent(&pldat->pdev->dev, pldat->dma_buff_size, - pldat->dma_buff_base_v, - pldat->dma_buff_base_p); free_irq(ndev->irq, ndev); - iounmap(pldat->net_base); mdiobus_unregister(pldat->mii_bus); mdiobus_free(pldat->mii_bus); clk_disable(pldat->clk); - clk_put(pldat->clk); free_netdev(ndev); return 0;