Re: [PATCH 1/4] ab8500-charger: Check return value of regulator_enable

[Lee Jones <lee.jones@linaro.org>]

On Mon, 02 Sep 2013, Sachin Kamat wrote:

> Check the return value of regulator_enable to silence the following
> type of warnings:
> drivers/power/ab8500_charger.c:1390:20: warning: ignoring return value
> of ‘regulator_enable’, declared with attribute warn_unused_result
> [-Wunused-result]

I think I remember something about it being okay for the regulators to
fail, but that may have been something else. I think I'd be more
comfortable if we just raised a dev_warn() and didn't return early in
the error case.

> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/power/ab8500_charger.c |   14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
> index a4c4a10..fec0546 100644
> --- a/drivers/power/ab8500_charger.c
> +++ b/drivers/power/ab8500_charger.c
> @@ -1387,7 +1387,12 @@ static int ab8500_charger_ac_en(struct ux500_charger *charger,
>  		 * the GPADC module independant of the AB8500 chargers
>  		 */
>  		if (!di->vddadc_en_ac) {
> -			regulator_enable(di->regu);
> +			ret = regulator_enable(di->regu);
> +			if (ret) {
> +				dev_err(di->dev,
> +					"Failed to enable regulator\n");
> +				return ret;
> +			}
>  			di->vddadc_en_ac = true;
>  		}
>  
> @@ -1556,7 +1561,12 @@ static int ab8500_charger_usb_en(struct ux500_charger *charger,
>  		 * the GPADC module independant of the AB8500 chargers
>  		 */
>  		if (!di->vddadc_en_usb) {
> -			regulator_enable(di->regu);
> +			ret = regulator_enable(di->regu);
> +			if (ret) {
> +				dev_err(di->dev,
> +					"Failed to enable regulator\n");
> +				return ret;
> +			}
>  			di->vddadc_en_usb = true;
>  		}
>  

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog