lkml.org 
[lkml]   [2012]   [Sep]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 44/57] power: ab8500: remove unecesary define flag
On Tue, Sep 25, 2012 at 10:12:41AM -0600, mathieu.poirier@linaro.org wrote:
> From: Marcus Cooper <marcus.xm.cooper@stericsson.com>
>
> Remove flag that serve no purpose from source code, Kconfig
> and Makefile.
>
> Signed-off-by: Marcus Cooper <marcus.xm.cooper@stericsson.com>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> Reviewed-by: Hakan BERG <hakan.berg@stericsson.com>
> Reviewed-by: Mian Yousaf KAUKAB <mian.yousaf.kaukab@stericsson.com>
> ---
> 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


\
 
 \ /
  Last update: 2012-09-28 03:41    [W:0.276 / U:0.340 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site