Re: [PATCH 11/21] mfd: use devm_irq_of_parse_and_map() where appropriate

[Lee Jones]

> From: Nikita Yushchenko <nyushchenko@xxxxxxxxxxxxx>
> 
> This avoids leak of IRQ mapping on error paths, and makes it possible
> to use devm_request_irq() without facing unmap-while-handler-installed
> issues.
> 
> Signed-off-by: Nikita Yushchenko <nyushchenko@xxxxxxxxxxxxx>
> ---
>  drivers/mfd/max8997.c |    4 +++-
>  drivers/mfd/max8998.c |    4 +++-
>  2 files changed, 6 insertions(+), 2 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
> index 8cf7a01..6ae0786 100644
> --- a/drivers/mfd/max8997.c
> +++ b/drivers/mfd/max8997.c
> @@ -153,7 +153,9 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
>  		return ERR_PTR(-ENOMEM);
>  	}
>  
> -	pd->ono = irq_of_parse_and_map(dev->of_node, 1);
> +	pd->ono = devm_irq_of_parse_and_map(dev, dev->of_node, 1);
> +	if (pd->ono < 0)
> +		return ERR_PTR(pd->ono);
>  
>  	/*
>  	 * ToDo: the 'wakeup' member in the platform data is more of a linux
> diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
> index 592db06..6b62dd7 100644
> --- a/drivers/mfd/max8998.c
> +++ b/drivers/mfd/max8998.c
> @@ -159,7 +159,9 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata(
>  	if (!pd)
>  		return ERR_PTR(-ENOMEM);
>  
> -	pd->ono = irq_of_parse_and_map(dev->of_node, 1);
> +	pd->ono = devm_irq_of_parse_and_map(dev, dev->of_node, 1);
> +	if (pd->ono < 0)
> +		return ERR_PTR(pd->ono);
>  
>  	/*
>  	 * ToDo: the 'wakeup' member in the platform data is more of a linux

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/