Messages in this thread | | | Date | Tue, 20 Jul 2010 11:46:59 +0400 | From | Anton Vorontsov <> | Subject | Re: [PATCH] ds2782_battery: Rename get_current and get_voltage operations |
| |
On Tue, Jul 20, 2010 at 01:02:55AM +0100, Ben Hutchings wrote: > commit 9b9ade6b612e562c4a5bd02ef38cc32e10f3f9ba "ds2782_battery: Add > support for ds2786 battery gas gauge" introduced an operation named > get_current. Since get_current() is defined as a macro on some > architectures this driver no longer compiles on those architectures. > > Rename get_current to get_current_now to avoid the macro. > Rename get_voltage to get_voltage_now for consistency. > > Reported-by: Geert Stappers <stappers@stappers.nl> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> > ---
Thanks for the patch, but I have a similar fix in the battery-2.6.git tree (for -next):
commit eb9650d6d989f24f21232a055d8fd45f1a9dcf99 Author: Peter Huewe <peterhuewe@gmx.de> Date: Thu May 13 01:54:57 2010 +0200
ds2782_battery: Rename get_current to fix build failure / name conflict
This patch changes the name of get_current function pointer to get_battery_current to resolve a name conflict with the get_current macro defined in current.h.
This conflict resulted in a build-failure[1] for the sh4 arch allyesconfig:
drivers/power/ds2782_battery.c:216:48: error: macro "get_current" passed 2 arguments, but takes just
This patch fixes the issue. To be consistent the other function pointers (_voltage,_capacity) were renamed too.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Acked-by: Ryan Mallon <ryan@bluewatersys.com> Acked-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
I'm not pushing this into 2.6.35 as this is not a 2.6.35 regression, it's there since 2.6.33, and nobody seemed to care for two releases. So, I'm not considering this as urgent.
Thanks!
-- Anton Vorontsov email: cbouatmailru@gmail.com irc://irc.freenode.net/bd2
| |