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>
This commit is contained in:
Родитель
7e27d6e778
Коммит
eb9650d6d9
|
@ -43,10 +43,9 @@
|
||||||
struct ds278x_info;
|
struct ds278x_info;
|
||||||
|
|
||||||
struct ds278x_battery_ops {
|
struct ds278x_battery_ops {
|
||||||
int (*get_current)(struct ds278x_info *info, int *current_uA);
|
int (*get_battery_current)(struct ds278x_info *info, int *current_uA);
|
||||||
int (*get_voltage)(struct ds278x_info *info, int *voltage_uA);
|
int (*get_battery_voltage)(struct ds278x_info *info, int *voltage_uA);
|
||||||
int (*get_capacity)(struct ds278x_info *info, int *capacity_uA);
|
int (*get_battery_capacity)(struct ds278x_info *info, int *capacity_uA);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define to_ds278x_info(x) container_of(x, struct ds278x_info, battery)
|
#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 current_uA;
|
||||||
int capacity;
|
int capacity;
|
||||||
|
|
||||||
err = info->ops->get_current(info, ¤t_uA);
|
err = info->ops->get_battery_current(info, ¤t_uA);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
err = info->ops->get_capacity(info, &capacity);
|
err = info->ops->get_battery_capacity(info, &capacity);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
@ -246,15 +245,15 @@ static int ds278x_battery_get_property(struct power_supply *psy,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case POWER_SUPPLY_PROP_CAPACITY:
|
case POWER_SUPPLY_PROP_CAPACITY:
|
||||||
ret = info->ops->get_capacity(info, &val->intval);
|
ret = info->ops->get_battery_capacity(info, &val->intval);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
|
case POWER_SUPPLY_PROP_VOLTAGE_NOW:
|
||||||
ret = info->ops->get_voltage(info, &val->intval);
|
ret = info->ops->get_battery_voltage(info, &val->intval);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case POWER_SUPPLY_PROP_CURRENT_NOW:
|
case POWER_SUPPLY_PROP_CURRENT_NOW:
|
||||||
ret = info->ops->get_current(info, &val->intval);
|
ret = info->ops->get_battery_current(info, &val->intval);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case POWER_SUPPLY_PROP_TEMP:
|
case POWER_SUPPLY_PROP_TEMP:
|
||||||
|
@ -307,14 +306,14 @@ enum ds278x_num_id {
|
||||||
|
|
||||||
static struct ds278x_battery_ops ds278x_ops[] = {
|
static struct ds278x_battery_ops ds278x_ops[] = {
|
||||||
[DS2782] = {
|
[DS2782] = {
|
||||||
.get_current = ds2782_get_current,
|
.get_battery_current = ds2782_get_current,
|
||||||
.get_voltage = ds2782_get_voltage,
|
.get_battery_voltage = ds2782_get_voltage,
|
||||||
.get_capacity = ds2782_get_capacity,
|
.get_battery_capacity = ds2782_get_capacity,
|
||||||
},
|
},
|
||||||
[DS2786] = {
|
[DS2786] = {
|
||||||
.get_current = ds2786_get_current,
|
.get_battery_current = ds2786_get_current,
|
||||||
.get_voltage = ds2786_get_voltage,
|
.get_battery_voltage = ds2786_get_voltage,
|
||||||
.get_capacity = ds2786_get_capacity,
|
.get_battery_capacity = ds2786_get_capacity,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче