| Message ID | 1364852755-17425-3-git-send-email-rklein@nvidia.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 04/01/2013 03:45 PM, Rhyland Klein wrote: > 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 patch resolves the concerns I had before, so, Reviewed-by: Stephen Warren <swarren@nvidia.com> > diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c > +static bool __power_supply_is_supplied_by(struct power_supply *supplier, > + struct power_supply *supply) > +{ > + int i; > + > + if (!supply->supplied_from && !supplier->supplied_to) > + return false; Nit: that somewhat duplicates the if below, so perhaps could just be removed? > + /* Support both supplied_to and supplied_from modes */ > + if (supply->supplied_from) { > + if (!supplier->name) > + return false; Likewise, I'm still not convinced these !name tests should be required. However, there's no harm here I think, so it's fine. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 02, 2013 at 03:31:30PM -0600, Stephen Warren wrote: > On 04/01/2013 03:45 PM, Rhyland Klein wrote: > > 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 patch resolves the concerns I had before, so, > Reviewed-by: Stephen Warren <swarren@nvidia.com> Thanks a lot for the work, folks! With some fixes (see comments for patch 3/3), this is now in battery-2.6.git tree. Anton -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 5deac43..d843cc9 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -26,17 +26,42 @@ EXPORT_SYMBOL_GPL(power_supply_class); static struct device_type power_supply_dev_type; +static bool __power_supply_is_supplied_by(struct power_supply *supplier, + struct power_supply *supply) +{ + int i; + + if (!supply->supplied_from && !supplier->supplied_to) + return false; + + /* Support both supplied_to and supplied_from modes */ + if (supply->supplied_from) { + if (!supplier->name) + return false; + for (i = 0; i < supply->num_supplies; i++) + if (!strcmp(supplier->name, supply->supplied_from[i])) + return true; + } else { + if (!supply->name) + return false; + for (i = 0; i < supplier->num_supplicants; i++) + if (!strcmp(supplier->supplied_to[i], supply->name)) + return true; + } + + return false; +} + 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 +93,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);
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 <rklein@nvidia.com> --- v2: - changed __power_supply_is_supplied_by to a boolean function - fixed up return paths with correct return values - moved loop invariant checks outside of loops 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 | 47 +++++++++++++++++++++++++++---------- include/linux/power_supply.h | 3 +++ 2 files changed, 37 insertions(+), 13 deletions(-)