Skip to content

Commit 1342540

Browse files
committed
power: supply: core: get rid of of_node
This removes .of_node from 'struct power_supply', since there is already a copy in .dev.of_node and there is no need to have two copies. Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20250225-psy-core-convert-to-fwnode-v1-1-d5e4369936bb@collabora.com Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 2fc78cd commit 1342540

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

drivers/power/supply/power_supply_core.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ static int __power_supply_populate_supplied_from(struct power_supply *epsy,
200200
int i = 0;
201201

202202
do {
203-
np = of_parse_phandle(psy->of_node, "power-supplies", i++);
203+
np = of_parse_phandle(psy->dev.of_node, "power-supplies", i++);
204204
if (!np)
205205
break;
206206

207-
if (np == epsy->of_node) {
207+
if (np == epsy->dev.of_node) {
208208
dev_dbg(&psy->dev, "%s: Found supply : %s\n",
209209
psy->desc->name, epsy->desc->name);
210210
psy->supplied_from[i-1] = (char *)epsy->desc->name;
@@ -235,7 +235,7 @@ static int __power_supply_find_supply_from_node(struct power_supply *epsy,
235235
struct device_node *np = data;
236236

237237
/* returning non-zero breaks out of power_supply_for_each_psy loop */
238-
if (epsy->of_node == np)
238+
if (epsy->dev.of_node == np)
239239
return 1;
240240

241241
return 0;
@@ -270,13 +270,13 @@ static int power_supply_check_supplies(struct power_supply *psy)
270270
return 0;
271271

272272
/* No device node found, nothing to do */
273-
if (!psy->of_node)
273+
if (!psy->dev.of_node)
274274
return 0;
275275

276276
do {
277277
int ret;
278278

279-
np = of_parse_phandle(psy->of_node, "power-supplies", cnt++);
279+
np = of_parse_phandle(psy->dev.of_node, "power-supplies", cnt++);
280280
if (!np)
281281
break;
282282

@@ -593,8 +593,8 @@ int power_supply_get_battery_info(struct power_supply *psy,
593593
const __be32 *list;
594594
u32 min_max[2];
595595

596-
if (psy->of_node) {
597-
battery_np = of_parse_phandle(psy->of_node, "monitored-battery", 0);
596+
if (psy->dev.of_node) {
597+
battery_np = of_parse_phandle(psy->dev.of_node, "monitored-battery", 0);
598598
if (!battery_np)
599599
return -ENODEV;
600600

@@ -1531,9 +1531,8 @@ __power_supply_register(struct device *parent,
15311531
if (cfg) {
15321532
dev->groups = cfg->attr_grp;
15331533
psy->drv_data = cfg->drv_data;
1534-
psy->of_node =
1534+
dev->of_node =
15351535
cfg->fwnode ? to_of_node(cfg->fwnode) : cfg->of_node;
1536-
dev->of_node = psy->of_node;
15371536
psy->supplied_to = cfg->supplied_to;
15381537
psy->num_supplicants = cfg->num_supplicants;
15391538
}

include/linux/power_supply.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ struct power_supply {
315315

316316
char **supplied_from;
317317
size_t num_supplies;
318-
struct device_node *of_node;
319318

320319
/* Driver private data */
321320
void *drv_data;

0 commit comments

Comments
 (0)