Skip to content

Commit 0bbdb13

Browse files
committed
Merge tag 'ib-regulator-psy-for-v6.17-signed' into psy-next
Merge immutable branch between power-supply and regulator subsystem, which updates the remaining user of power_supply_config.of_node to use .fwnode instead, so that the any code related to .of_node can be removed. Signed-off-by: Sebastian Reichel <[email protected]>
2 parents da32b6d + ceed136 commit 0bbdb13

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/regulator/act8865-regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ static int act8600_charger_probe(struct device *dev, struct regmap *regmap)
643643
struct power_supply *charger;
644644
struct power_supply_config cfg = {
645645
.drv_data = regmap,
646-
.of_node = dev->of_node,
646+
.fwnode = dev_fwnode(dev),
647647
};
648648

649649
charger = devm_power_supply_register(dev, &act8600_charger_desc, &cfg);

0 commit comments

Comments
 (0)