From 850461b9718b8191e039cdbb693cb130fbc62b50 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Mar 2023 13:33:33 +0000 Subject: [PATCH] Revert "FROMLIST: power_supply: Use of-thermal cdev registration API" This reverts commit 287479f4036d86a58ec2629599b050814f73feec. It causes merge conflicts with the upstream release of 5.15.99 as the code it modifies is removed entirely there as it is buggy. If this really needs to come back, please resubmit it in a way that can work properly. Bug: 211709650 Cc: Manaf Meethalavalappu Pallikunhi Change-Id: I8311d1c3a60f2189bfe6a213495d98bb6fa0a3f3 Signed-off-by: Greg Kroah-Hartman --- drivers/power/supply/power_supply_core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 0b13c7484775..c126d63b08f9 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -1158,15 +1158,9 @@ static int psy_register_cooler(struct power_supply *psy) for (i = 0; i < psy->desc->num_properties; i++) { if (psy->desc->properties[i] == POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT) { - if (psy->dev.parent) - psy->tcd = thermal_of_cooling_device_register( - dev_of_node(psy->dev.parent), - (char *)psy->desc->name, - psy, &psy_tcd_ops); - else - psy->tcd = thermal_cooling_device_register( - (char *)psy->desc->name, - psy, &psy_tcd_ops); + psy->tcd = thermal_cooling_device_register( + (char *)psy->desc->name, + psy, &psy_tcd_ops); return PTR_ERR_OR_ZERO(psy->tcd); } }