]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
power: supply: core: remove of_node from power_supply_config
authorSebastian Reichel <sebastian.reichel@collabora.com>
Sun, 8 Jun 2025 20:40:02 +0000 (22:40 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Sat, 21 Jun 2025 23:48:58 +0000 (01:48 +0200)
All drivers have been migrated from .of_node to .fwnode,
so let's kill the former.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Link: https://lore.kernel.org/r/20250430-psy-core-convert-to-fwnode-v2-2-f9643b958677@collabora.com
Reviewed-by: Hans de Goede <hansg@kernel.org>
Signed-off-by: Hans de Goede <hansg@kernel.org>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/power_supply_core.c
include/linux/power_supply.h

index 33a5bfce4604f012344733ba489eda1c5e8b92c0..89947f1fe610d8a75756e1e4e5339b06349f9ab8 100644 (file)
@@ -1529,10 +1529,9 @@ __power_supply_register(struct device *parent,
        dev_set_drvdata(dev, psy);
        psy->desc = desc;
        if (cfg) {
+               device_set_node(dev, cfg->fwnode);
                dev->groups = cfg->attr_grp;
                psy->drv_data = cfg->drv_data;
-               dev->of_node =
-                       cfg->fwnode ? to_of_node(cfg->fwnode) : cfg->of_node;
                psy->supplied_to = cfg->supplied_to;
                psy->num_supplicants = cfg->num_supplicants;
        }
index 7803edaa8ff8dac786a1f1e6e185d8adea0bccfe..72012141656ef8a7b5f4e3a19cd587bb3698fe0f 100644 (file)
@@ -232,7 +232,6 @@ struct power_supply;
 
 /* Run-time specific power supply configuration */
 struct power_supply_config {
-       struct device_node *of_node;
        struct fwnode_handle *fwnode;
 
        /* Driver private data */