[PATCH v2 2/5] power: supply: core: remove of_node from power_supply_config

Sebastian Reichel posted 5 patches 9 months, 2 weeks ago
[PATCH v2 2/5] power: supply: core: remove of_node from power_supply_config
Posted by Sebastian Reichel 9 months, 2 weeks ago
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>
---
 drivers/power/supply/power_supply_core.c | 3 +--
 include/linux/power_supply.h             | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
index 33a5bfce4604f012344733ba489eda1c5e8b92c0..89947f1fe610d8a75756e1e4e5339b06349f9ab8 100644
--- a/drivers/power/supply/power_supply_core.c
+++ b/drivers/power/supply/power_supply_core.c
@@ -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;
 	}
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index c4cb854971f53a244ba7742a15ce7a5515da6199..b6eb31a23c878aa9ed8ad7bcb02a13721354e1cb 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -229,7 +229,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 */

-- 
2.47.2
Re: [PATCH v2 2/5] power: supply: core: remove of_node from power_supply_config
Posted by Hans de Goede 8 months ago
Hi,

On 30-Apr-25 12:54 AM, Sebastian Reichel wrote:
> 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>

Thanks, patch looks good to me:

Reviewed-by: Hans de Goede <hansg@kernel.org>

Regards,

Hans


> ---
>  drivers/power/supply/power_supply_core.c | 3 +--
>  include/linux/power_supply.h             | 1 -
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c
> index 33a5bfce4604f012344733ba489eda1c5e8b92c0..89947f1fe610d8a75756e1e4e5339b06349f9ab8 100644
> --- a/drivers/power/supply/power_supply_core.c
> +++ b/drivers/power/supply/power_supply_core.c
> @@ -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;
>  	}
> diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
> index c4cb854971f53a244ba7742a15ce7a5515da6199..b6eb31a23c878aa9ed8ad7bcb02a13721354e1cb 100644
> --- a/include/linux/power_supply.h
> +++ b/include/linux/power_supply.h
> @@ -229,7 +229,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 */
>