power: supply: core: use power_supply_for_each_psy()

Simplify the callbacks by removing the need to convert a 'struct device'
into a 'struct power_supply'.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://lore.kernel.org/r/20241210-power-supply-dev_to_psy-v2-3-9d8c9d24cfe4@weissschuh.net
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 48bc968ff6c54d4b196c3faf450ef6464cdb305d..9adea87c69124f7025a06fe7550892392e28cd65 100644 (file)
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -66,10 +66,9 @@ static bool __power_supply_is_supplied_by(struct power_supply *supplier,
        return false;
 }
 
-static int __power_supply_changed_work(struct device *dev, void *data)
+static int __power_supply_changed_work(struct power_supply *pst, void *data)
 {
        struct power_supply *psy = data;
-       struct power_supply *pst = dev_get_drvdata(dev);
 
        if (__power_supply_is_supplied_by(psy, pst)) {
                if (pst->desc->external_power_changed)
@@ -98,7 +97,7 @@ static void power_supply_changed_work(struct work_struct *work)
        if (likely(psy->changed)) {
                psy->changed = false;
                spin_unlock_irqrestore(&psy->changed_lock, flags);
-               power_supply_for_each_device(psy, __power_supply_changed_work);
+               power_supply_for_each_psy(psy, __power_supply_changed_work);
                power_supply_update_leds(psy);
                blocking_notifier_call_chain(&power_supply_notifier,
                                PSY_EVENT_PROP_CHANGED, psy);
@@ -190,11 +189,10 @@ static void power_supply_deferred_register_work(struct work_struct *work)
 }
 
 #ifdef CONFIG_OF
-static int __power_supply_populate_supplied_from(struct device *dev,
+static int __power_supply_populate_supplied_from(struct power_supply *epsy,
                                                 void *data)
 {
        struct power_supply *psy = data;
-       struct power_supply *epsy = dev_get_drvdata(dev);
        struct device_node *np;
        int i = 0;
 
@@ -221,20 +219,19 @@ static int power_supply_populate_supplied_from(struct power_supply *psy)
 {
        int error;
 
-       error = power_supply_for_each_device(psy, __power_supply_populate_supplied_from);
+       error = power_supply_for_each_psy(psy, __power_supply_populate_supplied_from);
 
        dev_dbg(&psy->dev, "%s %d\n", __func__, error);
 
        return error;
 }
 
-static int  __power_supply_find_supply_from_node(struct device *dev,
+static int  __power_supply_find_supply_from_node(struct power_supply *epsy,
                                                 void *data)
 {
        struct device_node *np = data;
-       struct power_supply *epsy = dev_get_drvdata(dev);
 
-       /* returning non-zero breaks out of power_supply_for_each_device loop */
+       /* returning non-zero breaks out of power_supply_for_each_psy loop */
        if (epsy->of_node == np)
                return 1;
 
@@ -246,16 +243,16 @@ static int power_supply_find_supply_from_node(struct device_node *supply_node)
        int error;
 
        /*
-        * power_supply_for_each_device() either returns its own errors or values
+        * power_supply_for_each_psy() either returns its own errors or values
         * returned by __power_supply_find_supply_from_node().
         *
         * __power_supply_find_supply_from_node() will return 0 (no match)
         * or 1 (match).
         *
-        * We return 0 if power_supply_for_each_device() returned 1, -EPROBE_DEFER if
+        * We return 0 if power_supply_for_each_psy() returned 1, -EPROBE_DEFER if
         * it returned 0, or error as returned by it.
         */
-       error = power_supply_for_each_device(supply_node, __power_supply_find_supply_from_node);
+       error = power_supply_for_each_psy(supply_node, __power_supply_find_supply_from_node);
 
        return error ? (error == 1 ? 0 : error) : -EPROBE_DEFER;
 }
@@ -340,10 +337,9 @@ struct psy_am_i_supplied_data {
        unsigned int count;
 };
 
-static int __power_supply_am_i_supplied(struct device *dev, void *_data)
+static int __power_supply_am_i_supplied(struct power_supply *epsy, void *_data)
 {
        union power_supply_propval ret = {0,};
-       struct power_supply *epsy = dev_get_drvdata(dev);
        struct psy_am_i_supplied_data *data = _data;
 
        if (__power_supply_is_supplied_by(epsy, data->psy)) {
@@ -361,7 +357,7 @@ int power_supply_am_i_supplied(struct power_supply *psy)
        struct psy_am_i_supplied_data data = { psy, 0 };
        int error;
 
-       error = power_supply_for_each_device(&data, __power_supply_am_i_supplied);
+       error = power_supply_for_each_psy(&data, __power_supply_am_i_supplied);
 
        dev_dbg(&psy->dev, "%s count %u err %d\n", __func__, data.count, error);
 
@@ -372,10 +368,9 @@ int power_supply_am_i_supplied(struct power_supply *psy)
 }
 EXPORT_SYMBOL_GPL(power_supply_am_i_supplied);
 
-static int __power_supply_is_system_supplied(struct device *dev, void *data)
+static int __power_supply_is_system_supplied(struct power_supply *psy, void *data)
 {
        union power_supply_propval ret = {0,};
-       struct power_supply *psy = dev_get_drvdata(dev);
        unsigned int *count = data;
 
        if (!psy->desc->get_property(psy, POWER_SUPPLY_PROP_SCOPE, &ret))
@@ -396,7 +391,7 @@ int power_supply_is_system_supplied(void)
        int error;
        unsigned int count = 0;
 
-       error = power_supply_for_each_device(&count, __power_supply_is_system_supplied);
+       error = power_supply_for_each_psy(&count, __power_supply_is_system_supplied);
 
        /*
         * If no system scope power class device was found at all, most probably we
@@ -415,9 +410,8 @@ struct psy_get_supplier_prop_data {
        union power_supply_propval *val;
 };
 
-static int __power_supply_get_supplier_property(struct device *dev, void *_data)
+static int __power_supply_get_supplier_property(struct power_supply *epsy, void *_data)
 {
-       struct power_supply *epsy = dev_get_drvdata(dev);
        struct psy_get_supplier_prop_data *data = _data;
 
        if (__power_supply_is_supplied_by(epsy, data->psy))
@@ -442,7 +436,7 @@ int power_supply_get_property_from_supplier(struct power_supply *psy,
         * This function is not intended for use with a supply with multiple
         * suppliers, we simply pick the first supply to report the psp.
         */
-       ret = power_supply_for_each_device(&data, __power_supply_get_supplier_property);
+       ret = power_supply_for_each_psy(&data, __power_supply_get_supplier_property);
        if (ret < 0)
                return ret;
        if (ret == 0)