tsens_set_interrupt(priv, hw_id, UPPER, disable);
                        if (d.up_thresh > temp) {
                                dev_dbg(priv->dev, "[%u] %s: re-arm upper\n",
-                                       priv->sensor[i].hw_id, __func__);
+                                       hw_id, __func__);
                                tsens_set_interrupt(priv, hw_id, UPPER, enable);
                        } else {
                                trigger = true;
                        tsens_set_interrupt(priv, hw_id, LOWER, disable);
                        if (d.low_thresh < temp) {
                                dev_dbg(priv->dev, "[%u] %s: re-arm low\n",
-                                       priv->sensor[i].hw_id, __func__);
+                                       hw_id, __func__);
                                tsens_set_interrupt(priv, hw_id, LOWER, enable);
                        } else {
                                trigger = true;
                if (trigger) {
                        dev_dbg(priv->dev, "[%u] %s: TZ update trigger (%d mC)\n",
                                hw_id, __func__, temp);
-                       thermal_zone_device_update(priv->sensor[i].tzd,
+                       thermal_zone_device_update(s->tzd,
                                                   THERMAL_EVENT_UNSPECIFIED);
                } else {
                        dev_dbg(priv->dev, "[%u] %s: no violation:  %d\n",
        spin_unlock_irqrestore(&priv->ul_lock, flags);
 
        dev_dbg(dev, "[%u] %s: (%d:%d)->(%d:%d)\n",
-               s->hw_id, __func__, d.low_thresh, d.up_thresh, cl_low, cl_high);
+               hw_id, __func__, d.low_thresh, d.up_thresh, cl_low, cl_high);
 
        return 0;
 }