Re: [PATCH v2 1/4] ab8500-charger: Check return value ofregulator_enable

[Lee Jones]

On Fri, 06 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]
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx>
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> ---
> Compile tested.
> Changes since v1:
>  * converted dev_err and return to dev_warn as suggested by Lee Jones.
> ---
>  drivers/power/ab8500_charger.c |   20 ++++++++++++++++----
>  1 file changed, 16 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
> index a4c4a10..0d355a9 100644
> --- a/drivers/power/ab8500_charger.c
> +++ b/drivers/power/ab8500_charger.c
> @@ -1387,8 +1387,14 @@ 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);
> -			di->vddadc_en_ac = true;
> +			ret = regulator_enable(di->regu);
> +			if (ret) {
> +				dev_warn(di->dev,
> +					"Failed to enable regulator\n");
> +				di->vddadc_en_ac = false;

Isn't di->vddadc_en_ac already false?

Or you wouldn't have made it into the if().

> +			} else {
> +				di->vddadc_en_ac = true;
> +			}
>  		}
>  
>  		/* Check if the requested voltage or current is valid */
> @@ -1556,8 +1562,14 @@ 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);
> -			di->vddadc_en_usb = true;
> +			ret = regulator_enable(di->regu);
> +			if (ret) {
> +				dev_warn(di->dev,
> +					"Failed to enable regulator\n");
> +				di->vddadc_en_usb = false;

Same thing here.

> +			} else {
> +				di->vddadc_en_usb = true;
> +			}
>  		}
>  
>  		/* Enable USB charging */

-- 
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/