From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 Jul 2010 16:22:55 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/cbou/battery-2.6.35
X-Git-Tag: v2.6.35~24
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a?hp=-c

Merge git://git.infradead.org/users/cbou/battery-2.6.35

* git://git.infradead.org/users/cbou/battery-2.6.35:
  ds2782_battery: Rename get_current to fix build failure / name conflict
---

02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a
diff --combined drivers/power/ds2782_battery.c
index 2afbeec8b791,9b3b4b70f6f3..84d3c43cf2bc
--- a/drivers/power/ds2782_battery.c
+++ b/drivers/power/ds2782_battery.c
@@@ -43,10 -43,9 +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)
@@@ -163,7 -162,7 +162,7 @@@ static int ds2782_get_capacity(struct d
  	if (err)
  		return err;
  	*capacity = raw;
 -	return raw;
 +	return 0;
  }
  
  static int ds2786_get_current(struct ds278x_info *info, int *current_uA)
@@@ -213,11 -212,11 +212,11 @@@ static int ds278x_get_status(struct ds2
  	int current_uA;
  	int capacity;
  
- 	err = info->ops->get_current(info, &current_uA);
+ 	err = info->ops->get_battery_current(info, &current_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 +245,15 @@@ static int ds278x_battery_get_property(
  		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 +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,
  	}
  };