genesi/linux-legacy
1
0
Fork 0
mirror of https://github.com/genesi/linux-legacy.git synced 2026-02-04 08:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

sbs: rename platform insertion status functions

Browse Source
This commit is contained in:
Saleem Abdulrasool
2011-01-26 20:42:18 -08:00
parent 2b688d086c
commit 5070e11542
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-mx5/mx51_efikasb.c
View File

@@ -360,8 +360,8 @@ static struct platform_device mxc_led_device = {
};
static struct sbs_platform_data sbs_platform_data = {
.get_mains_status = mxc_get_ac_adapter_insertion_status,
.get_battery_status = mxc_get_battery_insertion_status,
.mains_insertion_status = mxc_get_ac_adapter_insertion_status,
.battery_insertion_status = mxc_get_battery_insertion_status,
};
static struct mxc_battery_platform_data efikasb_batt_data = {

4
drivers/power/sbs.c
View File

@@ -371,7 +371,7 @@ static int sbs_get_battery_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_STATUS_FULL;
break;
case POWER_SUPPLY_PROP_PRESENT:
val->intval = batt->platform->get_battery_status();
val->intval = batt->platform->battery_insertion_status();
break;
case POWER_SUPPLY_PROP_VOLTAGE_NOW: /* uV */
val->intval = __mV_2_uV(batt, batt->cache.voltage);
@@ -504,7 +504,7 @@ static int sbs_get_mains_property(struct power_supply *psy,
switch (psp) {
case POWER_SUPPLY_PROP_ONLINE:
val->intval = batt->platform->get_mains_status();
val->intval = batt->platform->mains_insertion_status();
break;
default:
return -EINVAL;

5
include/linux/sbs.h
View File

@@ -32,8 +32,9 @@
#define LINUX_SBS_H
struct sbs_platform_data {
int (*get_mains_status)(void);
int (*get_battery_status)(void);
int (*mains_insertion_status)(void);
int (*battery_insertion_status)(void);
};
#endif