@@ -158,6 +158,11 @@ MODULE_DEVICE_TABLE(of, da9062_compatible_reg_id_table);
static int da9062_thermal_probe(struct platform_device *pdev)
{
+ struct thermal_zone_device_params tzdp = {
+ .ops = &da9062_thermal_ops,
+ .trips = trips,
+ .num_trips = ARRAY_SIZE(trips),
+ };
struct da9062 *chip = dev_get_drvdata(pdev->dev.parent);
struct da9062_thermal *thermal;
const struct of_device_id *match;
@@ -196,10 +201,11 @@ static int da9062_thermal_probe(struct platform_device *pdev)
INIT_DELAYED_WORK(&thermal->work, da9062_thermal_poll_on);
mutex_init(&thermal->lock);
- thermal->zone = thermal_zone_device_register_with_trips(thermal->config->name,
- trips, ARRAY_SIZE(trips), 0, thermal,
- &da9062_thermal_ops, NULL, pp_tmp,
- 0);
+ tzdp.type = thermal->config->name;
+ tzdp.devdata = thermal;
+ tzdp.passive_delay = pp_tmp;
+
+ thermal->zone = thermal_zone_device_register(&tzdp);
if (IS_ERR(thermal->zone)) {
dev_err(&pdev->dev, "Cannot register thermal zone device\n");
ret = PTR_ERR(thermal->zone);
The thermal API has a new thermal_zone_device_register() function which is deprecating the older thermal_zone_device_register_with_trips() and thermal_tripless_zone_device_register(). Migrate to the new thermal zone device registration function. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- drivers/thermal/da9062-thermal.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)