From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065Ab3DJSmo (ORCPT ); Wed, 10 Apr 2013 14:42:44 -0400 Received: from mail-la0-f52.google.com ([209.85.215.52]:62191 "EHLO mail-la0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738Ab3DJSmm (ORCPT ); Wed, 10 Apr 2013 14:42:42 -0400 Message-ID: <5165B264.6000605@cogentembedded.com> Date: Wed, 10 Apr 2013 22:41:40 +0400 From: Sergei Shtylyov Organization: Cogent Embedded User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 MIME-Version: 1.0 To: Sebastian Hesselbarth CC: Lennert Buytenhek , Andrew Lunn , Jason Cooper , Florian Fainelli , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] net: mv643xx_eth: use managed devm_kzalloc References: <1365615483-26318-1-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1365615483-26318-1-git-send-email-sebastian.hesselbarth@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello. On 04/10/2013 09:38 PM, Sebastian Hesselbarth wrote: > This patch moves shared private data kzalloc to managed devm_kzalloc and > cleans now unneccessary kfree and error handling. > > Signed-off-by: Sebastian Hesselbarth > --- > Note that there is also an ioremap call, that could be transferred to > devm_ioremap_resource. But as long as mv643xx_eth and mvmdio iomem > resources overlap, this will throw -EBUSY. > > Cc: Lennert Buytenhek > Cc: Andrew Lunn > Cc: Jason Cooper > Cc: Florian Fainelli > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > --- > drivers/net/ethernet/marvell/mv643xx_eth.c | 17 ++++------------- > 1 file changed, 4 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c > index bbe6104..955baab 100644 > --- a/drivers/net/ethernet/marvell/mv643xx_eth.c > +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c > @@ -2547,25 +2547,22 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev) > struct mv643xx_eth_shared_private *msp; > const struct mbus_dram_target_info *dram; > struct resource *res; > - int ret; > > if (!mv643xx_eth_version_printed++) > pr_notice("MV-643xx 10/100/1000 ethernet driver version %s\n", > mv643xx_eth_driver_version); > > - ret = -EINVAL; > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (res == NULL) > - goto out; > + return -EINVAL; > > - ret = -ENOMEM; > - msp = kzalloc(sizeof(*msp), GFP_KERNEL); > + msp = devm_kzalloc(&pdev->dev, sizeof(*msp), GFP_KERNEL); > if (msp == NULL) > - goto out; > + return -ENOMEM; > > msp->base = ioremap(res->start, resource_size(res)); > if (msp->base == NULL) > - goto out_free; > + return -EADDRNOTAVAIL; -ENOMEM usually. WBR, Sergei