Re: [PATCH 44/57] power: ab8500: remove unecesary define flag

[Anton Vorontsov]

On Tue, Sep 25, 2012 at 10:12:41AM -0600, mathieu.poirier@xxxxxxxxxx wrote:
> From: Marcus Cooper <marcus.xm.cooper@xxxxxxxxxxxxxx>
> 
> Remove flag that serve no purpose from source code, Kconfig
> and Makefile.
> 
> Signed-off-by: Marcus Cooper <marcus.xm.cooper@xxxxxxxxxxxxxx>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> Reviewed-by: Hakan BERG <hakan.berg@xxxxxxxxxxxxxx>
> Reviewed-by: Mian Yousaf KAUKAB <mian.yousaf.kaukab@xxxxxxxxxxxxxx>
> ---
>  drivers/power/Kconfig          |    7 -------
>  drivers/power/ab8500_charger.c |    2 +-
>  2 files changed, 1 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
> index c1892f3..f7c13ae 100644
> --- a/drivers/power/Kconfig
> +++ b/drivers/power/Kconfig
> @@ -303,13 +303,6 @@ config AB8500_BM
>  	depends on AB8500_CORE && AB8500_GPADC
>  	help
>  	  Say Y to include support for AB8500 battery management.
> -
> -config AB8500_BATTERY_THERM_ON_BATCTRL
> -	bool "Thermistor connected on BATCTRL ADC"
> -	depends on AB8500_BM
> -	help
> -	  Say Y to enable battery temperature measurements using
> -	  thermistor connected on BATCTRL ADC.

OK...

>  endif # POWER_SUPPLY
>  
>  source "drivers/power/avs/Kconfig"
> diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
> index 9449a33..d90fe9f 100644
> --- a/drivers/power/ab8500_charger.c
> +++ b/drivers/power/ab8500_charger.c
> @@ -3369,7 +3369,7 @@ static int __devexit ab8500_charger_remove(struct platform_device *pdev)
>  	flush_scheduled_work();
>  	if (di->usb_chg.enabled)
>  		power_supply_unregister(&di->usb_chg.psy);
> -	if (di->ac_chg.enabled)
> +	if (di->ac_chg.enabled && !di->ac_chg.external)

But the patch descriptions says that the patch is removing some flags, but
it adds something unrelated.

If anything, this should be two separate patches.

>  		power_supply_unregister(&di->ac_chg.psy);
>  
>  	platform_set_drvdata(pdev, NULL);
> -- 
> 1.7.5.4
--
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/