ds2782_battery: Rename get_current and get_voltage operations

PATCH In review Ben Hutchings 2 participants 6 messages Jul 20, 2010

Share & tools

Ben Hutchings

author

2010-07-20 00:03 UTC #0 lore raw

PATCH 1/1 ds2782_battery: Rename get_current and get_voltage operations

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 <[email protected]>

Signed-off-by Ben Hutchings <[email protected]>

---
 drivers/power/ds2782_battery.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

drivers/power/ds2782_battery.c +11 ~~-11~~

index d762a0c..8d0673f 100644
@@ -43,8 +43,8 @@
 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_current_now)(struct ds278x_info *info, int *current_uA);
+	int	(*get_voltage_now)(struct ds278x_info *info, int *voltage_uA);
 	int	(*get_capacity)(struct ds278x_info *info, int *capacity_uA);
 
 };

@@ -213,7 +213,7 @@ static int ds278x_get_status(struct ds278x_info *info, int *status)
 	int current_uA;
 	int capacity;
 
-	err = info->ops->get_current(info, &current_uA);
+	err = info->ops->get_current_now(info, &current_uA);
 	if (err)
 		return err;

@@ -250,11 +250,11 @@ static int ds278x_battery_get_property(struct power_supply *psy,
 		break;
 
 	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-		ret = info->ops->get_voltage(info, &val->intval);
+		ret = info->ops->get_voltage_now(info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CURRENT_NOW:
-		ret = info->ops->get_current(info, &val->intval);
+		ret = info->ops->get_current_now(info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_TEMP:

@@ -307,14 +307,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_current_now = ds2782_get_current,
+		.get_voltage_now = ds2782_get_voltage,
+		.get_capacity    = ds2782_get_capacity,
 	},
 	[DS2786] = {
-		.get_current  = ds2786_get_current,
-		.get_voltage  = ds2786_get_voltage,
-		.get_capacity = ds2786_get_capacity,
+		.get_current_now = ds2786_get_current,
+		.get_voltage_now = ds2786_get_voltage,
+		.get_capacity    = ds2786_get_capacity,
 	}
 };

Signature · 1 line

1.7.1

Anton Vorontsov

Acked-by Ryan Mallon Acked-by Mike Rapoport on v1 1/1

2010-07-20 07:47 UTC #1 lore raw

Quoted 11 lines · Ben Hutchings

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 <[email protected]>
Signed-off-by Ben Hutchings <[email protected]>
---

Thanks for the patch, but I have a similar fix in the battery-2.6.git tree (for -next):

commit eb9650d6d989f24f21232a055d8fd45f1a9dcf99

Author: Peter Huewe <[email protected]>
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 <[email protected]>

Acked-by Ryan Mallon <[email protected]>

Acked-by Mike Rapoport <[email protected]>

Signed-off-by Anton Vorontsov <[email protected]>

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!

Signature · 3 lines

Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2

Ben Hutchings

author

2010-07-20 09:44 UTC #2 lore raw

Quoted 9 lines · Anton Vorontsov

Quoted 8 lines · Ben Hutchings
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.

Quoted 6 lines

Quoted 3 lines
Reported-by Geert Stappers <[email protected]>
Signed-off-by Ben Hutchings <[email protected]>
---
Thanks for the patch, but I have a similar fix in the battery-2.6.git tree (for -next):

[...]

This fix needs to go into 2.6.35.

Ben.

Signature · 2 lines

Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.

Anton Vorontsov

2010-07-20 10:57 UTC #3 lore raw

Quoted 14 lines · Ben Hutchings

Quoted 13 lines · Anton Vorontsov
Quoted 11 lines · Ben Hutchings
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 <[email protected]>
Signed-off-by Ben Hutchings <[email protected]>
---

Quoted 5 lines

Quoted 2 lines
Thanks for the patch, but I have a similar fix in the battery-2.6.git tree (for -next):
[...]
This fix needs to go into 2.6.35.

Did you read why I don't push it into 2.6.35? Reread my email, pay attention to the very bottom.

Signature · 3 lines

Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2

Ben Hutchings

author

2010-07-20 11:50 UTC #4 lore raw

Quoted 15 lines · Anton Vorontsov

Quoted 14 lines · Ben Hutchings
Quoted 13 lines · Anton Vorontsov
Quoted 11 lines · Ben Hutchings
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 <[email protected]>
Signed-off-by Ben Hutchings <[email protected]>
---

Quoted 8 lines

Quoted 5 lines
Quoted 2 lines
Thanks for the patch, but I have a similar fix in the battery-2.6.git tree (for -next):
[...]
This fix needs to go into 2.6.35.
Did you read why I don't push it into 2.6.35? Reread my email, pay attention to the very bottom.

It is a 2.6.35 regression; these operations were introduced in 2.6.35-rc1. (Hint: use 'git describe --contains' not 'git describe'. Or even 'git grep -w get_current v2.6.34:drivers/power/ds2782_battery.c'.)

Ben.

Signature · 3 lines

Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
                                                              - Albert Camus

Anton Vorontsov

2010-07-20 12:32 UTC #5 lore raw

Quoted 20 lines · Ben Hutchings

Quoted 19 lines · Anton Vorontsov
Quoted 18 lines · Ben Hutchings
Quoted 15 lines · Anton Vorontsov
Quoted 11 lines · Ben Hutchings
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 <[email protected]>
Signed-off-by Ben Hutchings <[email protected]>
---
Thanks for the patch, but I have a similar fix in the battery-2.6.git tree (for -next):
[...]

Quoted 8 lines

Quoted 4 lines
Quoted 1 line
This fix needs to go into 2.6.35.
Did you read why I don't push it into 2.6.35? Reread my email, pay attention to the very bottom.
It is a 2.6.35 regression; these operations were introduced in 2.6.35-rc1. (Hint: use 'git describe --contains' not 'git describe'. Or even 'git grep -w get_current v2.6.34:drivers/power/ds2782_battery.c'.)

Oh, I got it.

Will push, thanks!

Signature · 3 lines

Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2