Re: [PATCH 46/57] power: chargealg: Realign with upstream version

From: Anton Vorontsov
Date: Thu Sep 27 2012 - 21:19:42 EST


On Tue, Sep 25, 2012 at 10:12:43AM -0600, mathieu.poirier@xxxxxxxxxx wrote:
> From: Loic Pallardy <loic.pallardy@xxxxxxxxxxxxxx>
>
> Upstream version of AB charge algo has been reverted
> during kernel 3.4 port.

Why it's been reverted in the first place?.. If you're just reverting what
has been reverted before, you're probably breaking things again, so the
patch would [temporary] introduce some breakage?

> This patch restore state by:
> - renaming ab8500_chargal.c in abx500_chargal.c
> - renaming function from ab8500 to abx500
> - moving generic structure in "include/mfd/abx500.h"
>
> Goal is to ease next code reversion and realignment
> with mainline

I still hardly understand the rationale behind this change. But if it
compiles, bisectionable and works... it's fine by me. :-)

>
> Signed-off-by: Loic Pallardy <loic.pallardy@xxxxxxxxxxxxxx>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> Reviewed-by: Philippe LANGLAIS <philippe.langlais@xxxxxxxxxxxxxx>
> ---
> drivers/power/ab8500_charger.c | 166 +++++++++++-----------------------
> include/linux/mfd/abx500.h | 10 ++-
> include/linux/mfd/abx500/ab8500-bm.h | 5 +-
> 3 files changed, 65 insertions(+), 116 deletions(-)
>
[...]
> @@ -2678,7 +2616,7 @@ static void ab8500_charger_vbus_drop_end_work(struct work_struct *work)
> {
> struct ab8500_charger *di = container_of(work,
> struct ab8500_charger, vbus_drop_end_work.work);
> - int ret;
> + int ret, curr;

Should be one variable declaration per line.
--
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/