Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfa8a94b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: thermal: Reprogram the thresholds for the set_trips callback" into msm-4.9

parents 5a38ab8b b03f130b

drivers/thermal/of-thermal.c

+0 −5
Original line number Diff line number Diff line
@@ -140,16 +140,11 @@ static int of_thermal_set_trips(struct thermal_zone_device *tz, 
	mutex_lock(&data->senps->lock);

	of_thermal_aggregate_trip_types(tz, GENMASK(THERMAL_TRIP_CRITICAL, 0),

					&low, &high);

	if (low == data->senps->trip_low

		&& high == data->senps->trip_high)

		goto set_trips_exit;



	data->senps->trip_low = low;

	data->senps->trip_high = high;

	ret = data->senps->ops->set_trips(data->senps->sensor_data,

					  low, high);



set_trips_exit:

	mutex_unlock(&data->senps->lock);

	return ret;

}

drivers/thermal/thermal_core.c

+0 −4
Original line number Diff line number Diff line
@@ -553,10 +553,6 @@ void thermal_zone_set_trips(struct thermal_zone_device *tz) 
			high = trip_temp;

	}



	/* No need to change trip points */

	if (tz->prev_low_trip == low && tz->prev_high_trip == high)

		goto exit;



	tz->prev_low_trip = low;

	tz->prev_high_trip = high;