Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+14
-15
+14
-15
drivers/power/ds2782_battery.c
+14
-15
drivers/power/ds2782_battery.c
···
43
43
struct ds278x_info;
44
44
45
45
struct ds278x_battery_ops {
46
-
int (*get_current)(struct ds278x_info *info, int *current_uA);
47
-
int (*get_voltage)(struct ds278x_info *info, int *voltage_uA);
48
-
int (*get_capacity)(struct ds278x_info *info, int *capacity_uA);
49
-
46
+
int (*get_battery_current)(struct ds278x_info *info, int *current_uA);
47
+
int (*get_battery_voltage)(struct ds278x_info *info, int *voltage_uA);
48
+
int (*get_battery_capacity)(struct ds278x_info *info, int *capacity_uA);
50
49
};
51
50
52
51
#define to_ds278x_info(x) container_of(x, struct ds278x_info, battery)
···
212
213
int current_uA;
213
214
int capacity;
214
215
215
-
err = info->ops->get_current(info, ¤t_uA);
216
+
err = info->ops->get_battery_current(info, ¤t_uA);
216
217
if (err)
217
218
return err;
218
219
219
-
err = info->ops->get_capacity(info, &capacity);
220
+
err = info->ops->get_battery_capacity(info, &capacity);
220
221
if (err)
221
222
return err;
222
223
···
245
246
break;
246
247
247
248
case POWER_SUPPLY_PROP_CAPACITY:
248
-
ret = info->ops->get_capacity(info, &val->intval);
249
+
ret = info->ops->get_battery_capacity(info, &val->intval);
249
250
break;
250
251
251
252
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
252
-
ret = info->ops->get_voltage(info, &val->intval);
253
+
ret = info->ops->get_battery_voltage(info, &val->intval);
253
254
break;
254
255
255
256
case POWER_SUPPLY_PROP_CURRENT_NOW:
256
-
ret = info->ops->get_current(info, &val->intval);
257
+
ret = info->ops->get_battery_current(info, &val->intval);
257
258
break;
258
259
259
260
case POWER_SUPPLY_PROP_TEMP:
···
306
307
307
308
static struct ds278x_battery_ops ds278x_ops[] = {
308
309
[DS2782] = {
309
-
.get_current = ds2782_get_current,
310
-
.get_voltage = ds2782_get_voltage,
311
-
.get_capacity = ds2782_get_capacity,
310
+
.get_battery_current = ds2782_get_current,
311
+
.get_battery_voltage = ds2782_get_voltage,
312
+
.get_battery_capacity = ds2782_get_capacity,
312
313
},
313
314
[DS2786] = {
314
-
.get_current = ds2786_get_current,
315
-
.get_voltage = ds2786_get_voltage,
316
-
.get_capacity = ds2786_get_capacity,
315
+
.get_battery_current = ds2786_get_current,
316
+
.get_battery_voltage = ds2786_get_voltage,
317
+
.get_battery_capacity = ds2786_get_capacity,
317
318
}
318
319
};
319
320