On Fri, Apr 19, 2019 at 1:12 PM Yurii Pavlovskyi <yurii.pavlovskyi@xxxxxxxxx> wrote: > > The obviously wrong value 1 for temperature device ID in this driver is > returned by at least some devices, including TUF Gaming series laptops, > instead of 0 as expected previously. Observable effect is that a > temp1_input in hwmon reads temperature near absolute zero. > > * Consider 0.1 K an erroneous value in addition to 0 K. > * Refactor detection of thermal input availability to a separate function. > +static int asus_hwmon_check_thermal_available(struct asus_wmi *asus) > +{ > + u32 value = ASUS_WMI_UNSUPPORTED_METHOD; > + int err; > + > + asus->asus_hwmon_thermal_available = false; > + err = asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_THERMAL_CTRL, &value); > + The blank line probably should go before a call, but definitely not here. > + if (err < 0) { This needs comment why -ENODEV considered as non-fatal. > + if (err == -ENODEV) > + return 0; > + > + return err; > + } > + > + /* > + * If the temperature value in deci-Kelvin is near the absolute > + * zero temperature, something is clearly wrong. > + */ > + if (!value || value == 1) > + return 0; > + > + asus->asus_hwmon_thermal_available = true; > + return 0; > +} > if (attr == &dev_attr_pwm1.attr) > dev_id = ASUS_WMI_DEVID_FAN_CTRL; > - else if (attr == &dev_attr_temp1_input.attr) > - dev_id = ASUS_WMI_DEVID_THERMAL_CTRL; I don't see how this change affects the user output or driver behaviour. Why is it done? > - if (value == ASUS_WMI_UNSUPPORTED_METHOD || value & 0xFFF80000 > + if (value == ASUS_WMI_UNSUPPORTED_METHOD || (value & 0xFFF80000) Seems like a bug fix and thus should be a separate commit predecessing the series. > - } else if (dev_id == ASUS_WMI_DEVID_THERMAL_CTRL) { > + } else if (attr == &dev_attr_temp1_input.attr) { So, I don't see why you change this line. > + pr_warn("Could not check if thermal available: %d\n", status); > + pr_info("Thermal available: %d\n", asus->asus_hwmon_thermal_available); dev_*() ? -- With Best Regards, Andy Shevchenko