[PATCH v5 3/3] pinctrl: mvebu: Convert to use devm_ioremap_resource

[Gregory CLEMENT]

On 07/11/2013 04:08, Jisheng Zhang wrote:
> The resource mapped by of_iomap() isn't unmapped in error path. This
> patch fix the resource leakage by using devm_ioremap_resource() instead
> of of_iomap().
> 
> Signed-off-by: Jisheng Zhang <jszhang at marvell.com>
> Reviewed-by: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
> Acked-by: Jason Cooper <jason at lakedaemon.net>

Acked-by: Gregory CLEMENT <gregory.clement at free-electrons.com>


Thanks,

Gregory

> ---
>  drivers/pinctrl/mvebu/pinctrl-mvebu.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> index bb7ddb1..1caa45f 100644
> --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
> @@ -579,7 +579,7 @@ static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
>  int mvebu_pinctrl_probe(struct platform_device *pdev)
>  {
>  	struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
> -	struct device_node *np = pdev->dev.of_node;
> +	struct resource *res;
>  	struct mvebu_pinctrl *pctl;
>  	void __iomem *base;
>  	struct pinctrl_pin_desc *pdesc;
> @@ -591,11 +591,10 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> -	base = of_iomap(np, 0);
> -	if (!base) {
> -		dev_err(&pdev->dev, "unable to get base address\n");
> -		return -ENODEV;
> -	}
> +	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +	base = devm_ioremap_resource(&pdev->dev, res);
> +	if (IS_ERR(base))
> +		return PTR_ERR(base);
>  
>  	pctl = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pinctrl),
>  			GFP_KERNEL);
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com