On 8/5/22 01:43, Daniel Lezcano wrote:
> diff --git a/drivers/thermal/tegra/tegra30-tsensor.c b/drivers/thermal/tegra/tegra30-tsensor.c
> index 05886684f429..c34501287e96 100644
> --- a/drivers/thermal/tegra/tegra30-tsensor.c
> +++ b/drivers/thermal/tegra/tegra30-tsensor.c
> @@ -159,9 +159,9 @@ static void devm_tegra_tsensor_hw_disable(void *data)
> tegra_tsensor_hw_disable(ts);
> }
>
> -static int tegra_tsensor_get_temp(void *data, int *temp)
> +static int tegra_tsensor_get_temp(struct thermal_zone_device *tz, int *temp)
> {
> - const struct tegra_tsensor_channel *tsc = data;
> + const struct tegra_tsensor_channel *tsc = tz->devdata;
> const struct tegra_tsensor *ts = tsc->ts;
> int err, c1, c2, c3, c4, counter;
> u32 val;
> @@ -217,9 +217,9 @@ static int tegra_tsensor_temp_to_counter(const struct tegra_tsensor *ts, int tem
> return DIV_ROUND_CLOSEST(c2 * 1000000 - ts->calib.b, ts->calib.a);
> }
>
> -static int tegra_tsensor_set_trips(void *data, int low, int high)
> +static int tegra_tsensor_set_trips(struct thermal_zone_device *tz, int low, int high)
> {
> - const struct tegra_tsensor_channel *tsc = data;
> + const struct tegra_tsensor_channel *tsc = tz->devdata;
> const struct tegra_tsensor *ts = tsc->ts;
> u32 val;
>
> @@ -240,7 +240,7 @@ static int tegra_tsensor_set_trips(void *data, int low, int high)
> return 0;
> }
>
> -static const struct thermal_zone_of_device_ops ops = {
> +static const struct thermal_zone_device_ops ops = {
> .get_temp = tegra_tsensor_get_temp,
> .set_trips = tegra_tsensor_set_trips,
> };
> @@ -516,7 +516,7 @@ static int tegra_tsensor_register_channel(struct tegra_tsensor *ts,
> tsc->id = id;
> tsc->regs = ts->regs + 0x40 * (hw_id + 1);
>
> - tsc->tzd = devm_thermal_zone_of_sensor_register(ts->dev, id, tsc, &ops);
> + tsc->tzd = devm_thermal_of_zone_register(ts->dev, id, tsc, &ops);
> if (IS_ERR(tsc->tzd)) {
> if (PTR_ERR(tsc->tzd) != -ENODEV)
> return dev_err_probe(ts->dev, PTR_ERR(tsc->tzd),
Tested-by: Dmitry Osipenko <dmitry.osipenko@xxxxxxxxxxxxx> # Nexus7
--
Best regards,
Dmitry
