Merge remote-tracking branches 'asoc/fix/adsp', 'asoc/fix/amd', 'asoc/fix/atmel'...

[mirror_ubuntu-bionic-kernel.git] / drivers / thermal / intel_bxt_pmic_thermal.c

diff --git a/drivers/thermal/intel_bxt_pmic_thermal.c b/drivers/thermal/intel_bxt_pmic_thermal.c
index ef6b32242ccbce8c7258a7531d3d82d637a48f8a..94cfd0064c43bbbc1896ed2000e2d408655cdd29 100644 (file)
--- a/drivers/thermal/intel_bxt_pmic_thermal.c
+++ b/drivers/thermal/intel_bxt_pmic_thermal.c
@@ -166,7 +166,7 @@ static irqreturn_t pmic_thermal_irq_handler(int irq, void *data)
        struct pmic_thermal_data *td;
        struct intel_soc_pmic *pmic;
        struct regmap *regmap;
-       u8 reg_val, mask, irq_stat, trip;
+       u8 reg_val, mask, irq_stat;
        u16 reg, evt_stat_reg;
        int i, j, ret;
 
@@ -201,7 +201,6 @@ static irqreturn_t pmic_thermal_irq_handler(int irq, void *data)
                        if (regmap_read(regmap, evt_stat_reg, &ret))
                                return IRQ_HANDLED;
 
-                       trip = td->maps[i].trip_config[j].trip_num;
                        tzd = thermal_zone_get_zone_by_name(td->maps[i].handle);
                        if (!IS_ERR(tzd))
                                thermal_zone_device_update(tzd,