linux-kernel - Re: [PATCH -next] mtd: orion_nand: convert to use devm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Wed, 17 Jul 2013 09:45:33 +0200
From:	Andrew Lunn <andrew@...n.ch>
To:	Wei Yongjun <weiyj.lk@...il.com>
Cc:	dwmw2@...radead.org, grant.likely@...aro.org,
	rob.herring@...xeda.com, artem.bityutskiy@...ux.intel.com,
	jg1.han@...sung.com, andrew@...n.ch, wfp5p@...ginia.edu,
	yongjun_wei@...ndmicro.com.cn, linux-mtd@...ts.infradead.org,
	devicetree-discuss@...ts.ozlabs.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH -next] mtd: orion_nand: convert to use devm_* APIs

On Wed, Jul 17, 2013 at 10:09:10AM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
> 
> Convert to use devm_* APIs to avoid resources leak on error handling case.
> 
> Signed-off-by: Wei Yongjun <yongjun_wei@...ndmicro.com.cn>
> ---
>  drivers/mtd/nand/orion_nand.c | 29 +++++++++--------------------
>  1 file changed, 9 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
> index 46f308d..ce711b4 100644
> --- a/drivers/mtd/nand/orion_nand.c
> +++ b/drivers/mtd/nand/orion_nand.c
> @@ -85,25 +85,23 @@ static int __init orion_nand_probe(struct platform_device *pdev)
>  	int ret = 0;
>  	u32 val = 0;
>  
> -	nc = kzalloc(sizeof(struct nand_chip) + sizeof(struct mtd_info), GFP_KERNEL);
> +	nc = devm_kzalloc(&pdev->dev,
> +			  sizeof(struct nand_chip) + sizeof(struct mtd_info),
> +			  GFP_KERNEL);
>  	if (!nc) {
>  		printk(KERN_ERR "orion_nand: failed to allocate device structure.\n");
> -		ret = -ENOMEM;
> -		goto no_res;
> +		return -ENOMEM;
>  	}
>  	mtd = (struct mtd_info *)(nc + 1);
>  
>  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	if (!res) {
> -		ret = -ENODEV;
> -		goto no_res;
> -	}
> +	if (!res)
> +		return -ENODEV;
>  
> -	io_base = ioremap(res->start, resource_size(res));
> +	io_base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
>  	if (!io_base) {
>  		printk(KERN_ERR "orion_nand: ioremap failed\n");
> -		ret = -EIO;
> -		goto no_res;
> +		return -EIO;

Hi Wei

Thanks for working on this.

The above code can be further simplified:

        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        io_base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(io_base))
                return PTR_ERR(io_base); 


While you are editing this file, it would be nice to replace all the
printk() statements with dev_err(), dev_info() etc. Please do that as
a separate patch.

Thanks
	Andrew
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/