Skip to content

Commit

Permalink
hwmon: (gpio-fan) Remove un-necessary speed_index lookup for thermal …
Browse files Browse the repository at this point in the history
…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: b5cf88e ("(gpio-fan): Add thermal control hooks")
Reported-by: Tony Lindgren <[email protected]>
Cc: Guenter Roeck <[email protected]>
Cc: Eduardo Valentin <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Cc: [email protected]
Signed-off-by: Guenter Roeck <[email protected]>
  • Loading branch information
nmenon authored and groeck committed Feb 20, 2016
1 parent acc1469 commit 000e094
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/hwmon/gpio-fan.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,16 +406,11 @@ static int gpio_fan_get_cur_state(struct thermal_cooling_device *cdev,
unsigned long *state)
{
struct gpio_fan_data *fan_data = cdev->devdata;
int r;

if (!fan_data)
return -EINVAL;

r = get_fan_speed_index(fan_data);
if (r < 0)
return r;

*state = r;
*state = fan_data->speed_index;
return 0;
}

Expand Down

0 comments on commit 000e094

Please sign in to comment.