aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/power/power_supply_core.c28
-rw-r--r--include/linux/power_supply.h3
2 files changed, 31 insertions, 0 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 12cd6e36ff1d..cce75b40b435 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -116,6 +116,34 @@ int power_supply_is_system_supplied(void)
116} 116}
117EXPORT_SYMBOL_GPL(power_supply_is_system_supplied); 117EXPORT_SYMBOL_GPL(power_supply_is_system_supplied);
118 118
119int power_supply_set_battery_charged(struct power_supply *psy)
120{
121 if (psy->type == POWER_SUPPLY_TYPE_BATTERY && psy->set_charged) {
122 psy->set_charged(psy);
123 return 0;
124 }
125
126 return -EINVAL;
127}
128EXPORT_SYMBOL_GPL(power_supply_set_battery_charged);
129
130static int power_supply_match_device_by_name(struct device *dev, void *data)
131{
132 const char *name = data;
133 struct power_supply *psy = dev_get_drvdata(dev);
134
135 return strcmp(psy->name, name) == 0;
136}
137
138struct power_supply *power_supply_get_by_name(char *name)
139{
140 struct device *dev = class_find_device(power_supply_class, NULL, name,
141 power_supply_match_device_by_name);
142
143 return dev ? dev_get_drvdata(dev) : NULL;
144}
145EXPORT_SYMBOL_GPL(power_supply_get_by_name);
146
119int power_supply_register(struct device *parent, struct power_supply *psy) 147int power_supply_register(struct device *parent, struct power_supply *psy)
120{ 148{
121 int rc = 0; 149 int rc = 0;
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 4c7c6fc35487..b5d096d3a9be 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -144,6 +144,7 @@ struct power_supply {
144 enum power_supply_property psp, 144 enum power_supply_property psp,
145 union power_supply_propval *val); 145 union power_supply_propval *val);
146 void (*external_power_changed)(struct power_supply *psy); 146 void (*external_power_changed)(struct power_supply *psy);
147 void (*set_charged)(struct power_supply *psy);
147 148
148 /* For APM emulation, think legacy userspace. */ 149 /* For APM emulation, think legacy userspace. */
149 int use_for_apm; 150 int use_for_apm;
@@ -183,8 +184,10 @@ struct power_supply_info {
183 int use_for_apm; 184 int use_for_apm;
184}; 185};
185 186
187extern struct power_supply *power_supply_get_by_name(char *name);
186extern void power_supply_changed(struct power_supply *psy); 188extern void power_supply_changed(struct power_supply *psy);
187extern int power_supply_am_i_supplied(struct power_supply *psy); 189extern int power_supply_am_i_supplied(struct power_supply *psy);
190extern int power_supply_set_battery_charged(struct power_supply *psy);
188 191
189#if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE) 192#if defined(CONFIG_POWER_SUPPLY) || defined(CONFIG_POWER_SUPPLY_MODULE)
190extern int power_supply_is_system_supplied(void); 193extern int power_supply_is_system_supplied(void);