diff options
author | Nishanth Menon <nm@ti.com> | 2016-02-19 19:09:51 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2016-02-19 20:14:25 -0500 |
commit | 000e0949148382c4962489593a2f05504c2a6771 (patch) | |
tree | 0d4ae71256666f3f785bbae7e9f98bf89dab9ccf /drivers/hwmon | |
parent | acc146943957d7418a6846f06e029b2c5e87e0d5 (diff) |
hwmon: (gpio-fan) Remove un-necessary speed_index lookup for thermal hook
Thermal hook gpio_fan_get_cur_state is only interested in knowing
the current speed index that was setup in the system, this is
already available as part of fan_data->speed_index which is always
set by set_fan_speed. Using get_fan_speed_index is useful when we
have no idea about the fan speed configuration (for example during
fan_ctrl_init).
When thermal framework invokes
gpio_fan_get_cur_state=>get_fan_speed_index via gpio_fan_get_cur_state
especially in a polled configuration for thermal governor, we
basically hog the i2c interface to the extent that other functions
fail to get any traffic out :(.
Instead, just provide the last state set in the driver - since the gpio
fan driver is responsible for the fan state immaterial of override, the
fan_data->speed_index should accurately reflect the state.
Fixes: b5cf88e46bad ("(gpio-fan): Add thermal control hooks")
Reported-by: Tony Lindgren <tony@atomide.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/gpio-fan.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c index 82de3deeb18a..685568b1236d 100644 --- a/drivers/hwmon/gpio-fan.c +++ b/drivers/hwmon/gpio-fan.c | |||
@@ -406,16 +406,11 @@ static int gpio_fan_get_cur_state(struct thermal_cooling_device *cdev, | |||
406 | unsigned long *state) | 406 | unsigned long *state) |
407 | { | 407 | { |
408 | struct gpio_fan_data *fan_data = cdev->devdata; | 408 | struct gpio_fan_data *fan_data = cdev->devdata; |
409 | int r; | ||
410 | 409 | ||
411 | if (!fan_data) | 410 | if (!fan_data) |
412 | return -EINVAL; | 411 | return -EINVAL; |
413 | 412 | ||
414 | r = get_fan_speed_index(fan_data); | 413 | *state = fan_data->speed_index; |
415 | if (r < 0) | ||
416 | return r; | ||
417 | |||
418 | *state = r; | ||
419 | return 0; | 414 | return 0; |
420 | } | 415 | } |
421 | 416 | ||