This patch adds support for supplies to register a list of char *'s
which represent the list of supplies which supply them. This is the
opposite as the supplied_to list.
This change maintains support for supplied_to until all drivers which
make use of it already are converted.
Signed-off-by: Rhyland Klein <rkl...@nvidia.com>
---
v1:
- changed from RFC v2 -> patch v1
- removed list logic and instead added supplied_from char ** array and
num_supplies field
v2 (RFC):
- changed from struct device_node * contained in suppliers to a list
stored in the supplies.
- changed logic for the is_supplied_by check to handle the entire loop
as the array structure is difference between the 2 paths.
drivers/power/power_supply_core.c | 49 +++++++++++++++++++++++++++----------
include/linux/power_supply.h | 3 +++
2 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/drivers/power/power_supply_core.c
b/drivers/power/power_supply_core.c
index 5deac43..dd675ae 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -26,17 +26,44 @@ EXPORT_SYMBOL_GPL(power_supply_class);
static struct device_type power_supply_dev_type;
+static int __power_supply_is_supplied_by(struct power_supply *supplier,
+ struct power_supply *supply)
+{
+ int i;
+
+ if (!supply->supplied_from && !supplier->supplied_to)
+ return -EINVAL;
+
+ /* Support both supplied_to and supplied_from modes */
+ if (supply->supplied_from) {
+ for (i = 0; i < supply->num_supplies; i++) {
+ if (!supplier->name)
+ continue;
+ if (!strcmp(supplier->name, supply->supplied_from[i]))
+ return 0;
+ }
+ } else {
+ for (i = 0; i < supplier->num_supplicants; i++) {
+ if (!supply->name)
+ continue;
+ if (!strcmp(supplier->supplied_to[i], supply->name))
+ return 0;
+ }
+ }
+
+ return -EINVAL;
+}
+
static int __power_supply_changed_work(struct device *dev, void *data)
{
struct power_supply *psy = (struct power_supply *)data;
struct power_supply *pst = dev_get_drvdata(dev);
- int i;
- for (i = 0; i < psy->num_supplicants; i++)
- if (!strcmp(psy->supplied_to[i], pst->name)) {
- if (pst->external_power_changed)
- pst->external_power_changed(pst);
- }
+ if (__power_supply_is_supplied_by(psy, pst)) {
+ if (pst->external_power_changed)
+ pst->external_power_changed(pst);
+ }
+
return 0;
}
@@ -68,17 +95,13 @@ static int __power_supply_am_i_supplied(struct device *dev,
void *data)
union power_supply_propval ret = {0,};
struct power_supply *psy = (struct power_supply *)data;
struct power_supply *epsy = dev_get_drvdata(dev);
- int i;
- for (i = 0; i < epsy->num_supplicants; i++) {
- if (!strcmp(epsy->supplied_to[i], psy->name)) {
- if (epsy->get_property(epsy,
- POWER_SUPPLY_PROP_ONLINE, &ret))
- continue;
+ if (__power_supply_is_supplied_by(epsy, psy))
+ if (!epsy->get_property(epsy, POWER_SUPPLY_PROP_ONLINE, &ret)) {
if (ret.intval)
return ret.intval;
}
- }
+
return 0;
}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 002a99f..c1cbd5e 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -171,6 +171,9 @@ struct power_supply {
char **supplied_to;
size_t num_supplicants;
+ char **supplied_from;
+ size_t num_supplies;
+
int (*get_property)(struct power_supply *psy,
enum power_supply_property psp,
union power_supply_propval *val);
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
