diff options
| -rw-r--r-- | drivers/thermal/msm-tsens.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/thermal/msm-tsens.c b/drivers/thermal/msm-tsens.c index d7cc99ba6c40..a9358a807769 100644 --- a/drivers/thermal/msm-tsens.c +++ b/drivers/thermal/msm-tsens.c @@ -199,14 +199,14 @@ enum tsens_tm_trip_type { #define TSENS_TM_WRITABLE_TRIPS_MASK ((1 << TSENS_TM_TRIP_NUM) - 1) struct tsens_thrshld_state { - enum thermal_device_mode high_th_state; - enum thermal_device_mode low_th_state; - enum thermal_device_mode crit_th_state; - unsigned int high_adc_code; - unsigned int low_adc_code; - int high_temp; - int low_temp; - int crit_temp; + enum thermal_trip_activation_mode high_th_state; + enum thermal_trip_activation_mode low_th_state; + enum thermal_trip_activation_mode crit_th_state; + unsigned int high_adc_code; + unsigned int low_adc_code; + int high_temp; + int low_temp; + int crit_temp; }; struct tsens_tm_device_sensor { @@ -1845,8 +1845,8 @@ static irqreturn_t tsens_tm_critical_irq_thread(int irq, void *data) TSENS_TM_CRITICAL_INT_CLEAR( tm->tsens_addr)); critical_thr = true; - tm->sensor[i].debug_thr_state_copy. - crit_th_state = THERMAL_DEVICE_DISABLED; + tm->sensor[i].debug_thr_state_copy.crit_th_state = + THERMAL_TRIP_ACTIVATION_DISABLED; } spin_unlock_irqrestore(&tm->tsens_crit_lock, flags); @@ -1927,8 +1927,8 @@ static irqreturn_t tsens_tm_irq_thread(int irq, void *data) TSENS_TM_UPPER_LOWER_INT_CLEAR( tm->tsens_addr)); upper_thr = true; - tm->sensor[i].debug_thr_state_copy. - high_th_state = THERMAL_DEVICE_DISABLED; + tm->sensor[i].debug_thr_state_copy.high_th_state = + THERMAL_TRIP_ACTIVATION_DISABLED; } if ((status & TSENS_TM_SN_STATUS_LOWER_STATUS) && @@ -1948,8 +1948,8 @@ static irqreturn_t tsens_tm_irq_thread(int irq, void *data) TSENS_TM_UPPER_LOWER_INT_CLEAR( tm->tsens_addr)); lower_thr = true; - tm->sensor[i].debug_thr_state_copy. - low_th_state = THERMAL_DEVICE_DISABLED; + tm->sensor[i].debug_thr_state_copy.low_th_state = + THERMAL_TRIP_ACTIVATION_DISABLED; } spin_unlock_irqrestore(&tm->tsens_upp_low_lock, flags); @@ -2026,16 +2026,16 @@ static irqreturn_t tsens_irq_thread(int irq, void *data) TSENS_S0_UPPER_LOWER_STATUS_CTRL_ADDR( tm->tsens_addr + addr_offset)); upper_thr = true; - tm->sensor[i].debug_thr_state_copy. - high_th_state = THERMAL_DEVICE_DISABLED; + tm->sensor[i].debug_thr_state_copy.high_th_state = + THERMAL_TRIP_ACTIVATION_DISABLED; } if (status & TSENS_SN_STATUS_LOWER_STATUS) { writel_relaxed(threshold | TSENS_LOWER_STATUS_CLR, TSENS_S0_UPPER_LOWER_STATUS_CTRL_ADDR( tm->tsens_addr + addr_offset)); lower_thr = true; - tm->sensor[i].debug_thr_state_copy. - low_th_state = THERMAL_DEVICE_DISABLED; + tm->sensor[i].debug_thr_state_copy.low_th_state = + THERMAL_TRIP_ACTIVATION_DISABLED; } if (upper_thr || lower_thr) { int temp; |