power: Rename get_current to fix build failure / name conflict
PATCH 1/1 power: Rename get_current to fix build failure / name conflict
From: Peter Huewe <[email protected]>
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 which is resolved by this patch.
To be consistent the other function pointers (_voltage,_capacity) were renamed too.
---
KernelVersion: linux-next 20100512
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2572665/
drivers/power/ds2782_battery.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-)
drivers/power/ds2782_battery.c +14 -15
@@ -43,10 +43,9 @@struct ds278x_info ;struct ds278x_battery_ops { -int (*get_current)(struct ds278x_info *info,int *current_uA); -int (*get_voltage)(struct ds278x_info *info,int *voltage_uA); -int (*get_capacity)(struct ds278x_info *info,int *capacity_uA); - +int (*get_battery_current)(struct ds278x_info *info,int *current_uA); +int (*get_battery_voltage)(struct ds278x_info *info,int *voltage_uA); +int (*get_battery_capacity)(struct ds278x_info *info,int *capacity_uA); };#define to_ds278x_info (x) container_of(x, struct ds278x_info, battery)
@@ -213,11 +212,11 @@ static int ds278x_get_status(struct ds278x_info *info, int *status)int current_uA;int capacity; - err = info->ops->get_current (info, ¤t_uA); + err = info->ops->get_battery_current (info, ¤t_uA);if (err)return err; - err = info->ops->get_capacity (info, &capacity); + err = info->ops->get_battery_capacity (info, &capacity);if (err)return err;
@@ -246,15 +245,15 @@ static int ds278x_battery_get_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_CAPACITY : - ret = info->ops->get_capacity (info, &val->intval); + ret = info->ops->get_battery_capacity (info, &val->intval);break ;case POWER_SUPPLY_PROP_VOLTAGE_NOW : - ret = info->ops->get_voltage (info, &val->intval); + ret = info->ops->get_battery_voltage (info, &val->intval);break ;case POWER_SUPPLY_PROP_CURRENT_NOW : - ret = info->ops->get_current (info, &val->intval); + ret = info->ops->get_battery_current (info, &val->intval);break ;case POWER_SUPPLY_PROP_TEMP :
@@ -307,14 +306,14 @@ enum ds278x_num_id {static struct ds278x_battery_ops ds278x_ops[] = { [DS2782 ] = { - .get_current = ds2782_get_current, - .get_voltage = ds2782_get_voltage, - .get_capacity = ds2782_get_capacity, + .get_battery_current = ds2782_get_current, + .get_battery_voltage = ds2782_get_voltage, + .get_battery_capacity = ds2782_get_capacity, }, [DS2786 ] = { - .get_current = ds2786_get_current, - .get_voltage = ds2786_get_voltage, - .get_capacity = ds2786_get_capacity, + .get_battery_current = ds2786_get_current, + .get_battery_voltage = ds2786_get_voltage, + .get_battery_capacity = ds2786_get_capacity, } };
Signature · 1 line
1.6.4.4
Quoted 8 lines · Peter Huewe
From: Peter Huewe <[email protected]>
This patch changes the name of
get_currentfunction pointer toget_battery_currentto resolve a name conflict with theget_currentmacro defined incurrent.h.This conflict resulted in a build-failure[1] for the sh4 arch allyesconfig which is resolved by this patch.
Ah, didn't think of that. Thanks.
Quoted 84 lines
To be consistent the other function pointers (_voltage,_capacity) were renamed too.
Signed-off-by Peter Huewe <[email protected]>---
KernelVersion: linux-next 20100512
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2572665/drivers/power/ds2782_battery.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-)drivers/power/ds2782_battery.c +14
-15@@ -43,10 +43,9 @@struct ds278x_info ;struct ds278x_battery_ops { -int (*get_current)(struct ds278x_info *info,int *current_uA); -int (*get_voltage)(struct ds278x_info *info,int *voltage_uA); -int (*get_capacity)(struct ds278x_info *info,int *capacity_uA); - +int (*get_battery_current)(struct ds278x_info *info,int *current_uA); +int (*get_battery_voltage)(struct ds278x_info *info,int *voltage_uA); +int (*get_battery_capacity)(struct ds278x_info *info,int *capacity_uA); };#define to_ds278x_info (x) container_of(x, struct ds278x_info, battery)@@ -213,11 +212,11 @@ static int ds278x_get_status(struct ds278x_info *info, int *status)int current_uA;int capacity; - err = info->ops->get_current (info, ¤t_uA); + err = info->ops->get_battery_current (info, ¤t_uA);if (err)return err; - err = info->ops->get_capacity (info, &capacity); + err = info->ops->get_battery_capacity (info, &capacity);if (err)return err;@@ -246,15 +245,15 @@ static int ds278x_battery_get_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_CAPACITY : - ret = info->ops->get_capacity (info, &val->intval); + ret = info->ops->get_battery_capacity (info, &val->intval);break ;case POWER_SUPPLY_PROP_VOLTAGE_NOW : - ret = info->ops->get_voltage (info, &val->intval); + ret = info->ops->get_battery_voltage (info, &val->intval);break ;case POWER_SUPPLY_PROP_CURRENT_NOW : - ret = info->ops->get_current (info, &val->intval); + ret = info->ops->get_battery_current (info, &val->intval);break ;case POWER_SUPPLY_PROP_TEMP :@@ -307,14 +306,14 @@ enum ds278x_num_id {static struct ds278x_battery_ops ds278x_ops[] = { [DS2782 ] = { - .get_current = ds2782_get_current, - .get_voltage = ds2782_get_voltage, - .get_capacity = ds2782_get_capacity, + .get_battery_current = ds2782_get_current, + .get_battery_voltage = ds2782_get_voltage, + .get_battery_capacity = ds2782_get_capacity, }, [DS2786 ] = { - .get_current = ds2786_get_current, - .get_voltage = ds2786_get_voltage, - .get_capacity = ds2786_get_capacity, + .get_battery_current = ds2786_get_current, + .get_battery_voltage = ds2786_get_voltage, + .get_battery_capacity = ds2786_get_capacity, } };
Signature · 7 lines
Bluewater Systems Ltd - ARM Technology Solution Centre Ryan Mallon 5 Amuri Park, 404 Barbadoes St [email protected] PO Box 13 889, Christchurch 8013 http://www.bluewatersys.com New Zealand Phone: +64 3 3779127 Freecall: Australia 1800 148 751 Fax: +64 3 3779135 USA 1800 261 2934
Quoted 6 lines · Peter Huewe
From: Peter Huewe <[email protected]>
This patch changes the name of
get_currentfunction pointer toget_battery_currentto resolve a name conflict with theget_currentmacro defined incurrent.h.
Quoted 7 lines
This conflict resulted in a build-failure[1] for the sh4 arch allyesconfig which is resolved by this patch.
To be consistent the other function pointers (_voltage,_capacity) were renamed too.
Signed-off-by Peter Huewe <[email protected]>
Quoted 80 lines
---
KernelVersion: linux-next 20100512
References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2572665/drivers/power/ds2782_battery.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-)drivers/power/ds2782_battery.c +14
-15@@ -43,10 +43,9 @@struct ds278x_info ;struct ds278x_battery_ops { -int (*get_current)(struct ds278x_info *info,int *current_uA); -int (*get_voltage)(struct ds278x_info *info,int *voltage_uA); -int (*get_capacity)(struct ds278x_info *info,int *capacity_uA); - +int (*get_battery_current)(struct ds278x_info *info,int *current_uA); +int (*get_battery_voltage)(struct ds278x_info *info,int *voltage_uA); +int (*get_battery_capacity)(struct ds278x_info *info,int *capacity_uA); };#define to_ds278x_info (x) container_of(x, struct ds278x_info, battery)@@ -213,11 +212,11 @@ static int ds278x_get_status(struct ds278x_info *info, int *status)int current_uA;int capacity; - err = info->ops->get_current (info, ¤t_uA); + err = info->ops->get_battery_current (info, ¤t_uA);if (err)return err; - err = info->ops->get_capacity (info, &capacity); + err = info->ops->get_battery_capacity (info, &capacity);if (err)return err;@@ -246,15 +245,15 @@ static int ds278x_battery_get_property(struct power_supply *psy,break ;case POWER_SUPPLY_PROP_CAPACITY : - ret = info->ops->get_capacity (info, &val->intval); + ret = info->ops->get_battery_capacity (info, &val->intval);break ;case POWER_SUPPLY_PROP_VOLTAGE_NOW : - ret = info->ops->get_voltage (info, &val->intval); + ret = info->ops->get_battery_voltage (info, &val->intval);break ;case POWER_SUPPLY_PROP_CURRENT_NOW : - ret = info->ops->get_current (info, &val->intval); + ret = info->ops->get_battery_current (info, &val->intval);break ;case POWER_SUPPLY_PROP_TEMP :@@ -307,14 +306,14 @@ enum ds278x_num_id {static struct ds278x_battery_ops ds278x_ops[] = { [DS2782 ] = { - .get_current = ds2782_get_current, - .get_voltage = ds2782_get_voltage, - .get_capacity = ds2782_get_capacity, + .get_battery_current = ds2782_get_current, + .get_battery_voltage = ds2782_get_voltage, + .get_battery_capacity = ds2782_get_capacity, }, [DS2786 ] = { - .get_current = ds2786_get_current, - .get_voltage = ds2786_get_voltage, - .get_capacity = ds2786_get_capacity, + .get_battery_current = ds2786_get_current, + .get_battery_voltage = ds2786_get_voltage, + .get_battery_capacity = ds2786_get_capacity, } };
Signature · 2 lines
Sincerely yours, Mike.
Am Donnerstag 13 Mai 2010 07:27:28 schrieb Mike Rapoport:
Quoted 10 lines
Quoted 9 lines · Peter Huewe
From: Peter Huewe <[email protected]>
This patch changes the name of
get_currentfunction pointer toget_battery_currentto resolve a name conflict with theget_currentmacro defined incurrent.h.This conflict resulted in a build-failure[1] for the sh4 arch allyesconfig which is resolved by this patch.
Quoted 6 lines
Quoted 4 lines
To be consistent the other function pointers (_voltage,_capacity) were renamed too.
Signed-off-by Peter Huewe <[email protected]>Acked-by Ryan Mallon <[email protected]>Acked-by Mike Rapoport <[email protected]>
Unfortunately this build-failure still exists, in Linux-next and hit Linus' Tree :/
References:
http://kisskb.ellerman.id.au/kisskb/buildresult/2709436/
http://kisskb.ellerman.id.au/kisskb/buildresult/2687686/
Thanks,
Peter
Quoted 18 lines · Peter Huewe
Am Donnerstag 13 Mai 2010 07:27:28 schrieb Mike Rapoport:
Quoted 10 lines
Quoted 9 lines · Peter Huewe
From: Peter Huewe <[email protected]>
This patch changes the name of
get_currentfunction pointer toget_battery_currentto resolve a name conflict with theget_currentmacro defined incurrent.h.This conflict resulted in a build-failure[1] for the sh4 arch allyesconfig which is resolved by this patch.
Quoted 6 lines
Quoted 4 lines
To be consistent the other function pointers (_voltage,_capacity) were renamed too.
Signed-off-by Peter Huewe <[email protected]>Acked-by Ryan Mallon <[email protected]>Acked-by Mike Rapoport <[email protected]>
Quoted 6 lines
Unfortunately this build-failure still exists, in Linux-next and hit Linus' Tree :/
References:
http://kisskb.ellerman.id.au/kisskb/buildresult/2709436/
http://kisskb.ellerman.id.au/kisskb/buildresult/2687686/
Thanks for the patch.
As this is not a 2.6.35 regression, and only affects just a few embedded platforms, I think this can wait for the next merge window.
So, applied to battery-2.6.git (for -next).
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2