Commit cbc28057 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

thermal: intel: intel_soc_dts_iosf: Pass sensors to update_trip_temp()

After previous changes, update_trip_temp() only uses its dts argument to
get to the sensors field in the struct intel_soc_dts_sensor_entry object
pointed to by that argument, so pass the value of that field directly to
it instead.

No intentional functional impact.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
parent 0b28ba27
...@@ -66,7 +66,7 @@ static int sys_get_trip_temp(struct thermal_zone_device *tzd, int trip, ...@@ -66,7 +66,7 @@ static int sys_get_trip_temp(struct thermal_zone_device *tzd, int trip,
return 0; return 0;
} }
static int update_trip_temp(struct intel_soc_dts_sensor_entry *dts, static int update_trip_temp(struct intel_soc_dts_sensors *sensors,
int thres_index, int temp) int thres_index, int temp)
{ {
int status; int status;
...@@ -78,7 +78,6 @@ static int update_trip_temp(struct intel_soc_dts_sensor_entry *dts, ...@@ -78,7 +78,6 @@ static int update_trip_temp(struct intel_soc_dts_sensor_entry *dts,
u32 store_te_out; u32 store_te_out;
u32 te_out; u32 te_out;
u32 int_enable_bit = SOC_DTS_TE_APICA_ENABLE; u32 int_enable_bit = SOC_DTS_TE_APICA_ENABLE;
struct intel_soc_dts_sensors *sensors = dts->sensors;
if (sensors->intr_type == INTEL_SOC_DTS_INTERRUPT_MSI) if (sensors->intr_type == INTEL_SOC_DTS_INTERRUPT_MSI)
int_enable_bit |= SOC_DTS_TE_MSI_ENABLE; int_enable_bit |= SOC_DTS_TE_MSI_ENABLE;
...@@ -162,7 +161,7 @@ static int configure_trip(struct intel_soc_dts_sensor_entry *dts, ...@@ -162,7 +161,7 @@ static int configure_trip(struct intel_soc_dts_sensor_entry *dts,
{ {
int ret; int ret;
ret = update_trip_temp(dts, thres_index, temp); ret = update_trip_temp(dts->sensors, thres_index, temp);
if (ret) if (ret)
return ret; return ret;
...@@ -182,7 +181,7 @@ static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip, ...@@ -182,7 +181,7 @@ static int sys_set_trip_temp(struct thermal_zone_device *tzd, int trip,
return -EINVAL; return -EINVAL;
mutex_lock(&sensors->dts_update_lock); mutex_lock(&sensors->dts_update_lock);
status = update_trip_temp(dts, trip, temp); status = update_trip_temp(sensors, trip, temp);
mutex_unlock(&sensors->dts_update_lock); mutex_unlock(&sensors->dts_update_lock);
return status; return status;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment