aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Stein <alexander.stein@ew.tq-group.com>2022-09-14 17:31:33 +0200
committerGuenter Roeck <linux@roeck-us.net>2022-09-25 14:22:10 -0700
commitbf10ccad068088f4e31f4d4266356d1d24cf5734 (patch)
tree7fde58f172c968150f49fa503658abde9d550c57
parenthwmon: (pmbus) Add driver for the TEXAS TPS546D24 Buck Converter. (diff)
downloadlinux-stable-bf10ccad068088f4e31f4d4266356d1d24cf5734.tar.xz
linux-stable-bf10ccad068088f4e31f4d4266356d1d24cf5734.zip
hwmon: (pwm-fan) Refactor fan power on/off
In preparation for dynamically switching regulator, split the power on and power off sequence into separate functions. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Link: https://lore.kernel.org/r/20220914153137.613982-2-alexander.stein@ew.tq-group.com Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-rw-r--r--drivers/hwmon/pwm-fan.c36
1 files changed, 30 insertions, 6 deletions
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index 06fd1d75101d..c8a7926d39e7 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -82,23 +82,47 @@ static void sample_timer(struct timer_list *t)
mod_timer(&ctx->rpm_timer, jiffies + HZ);
}
-static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm)
+static int pwm_fan_power_on(struct pwm_fan_ctx *ctx)
{
+ struct pwm_state *state = &ctx->pwm_state;
unsigned long period;
- int ret = 0;
+ int ret;
+
+ period = state->period;
+ state->duty_cycle = DIV_ROUND_UP(ctx->pwm_value * (period - 1), MAX_PWM);
+ state->enabled = true;
+ ret = pwm_apply_state(ctx->pwm, state);
+
+ return ret;
+}
+
+static int pwm_fan_power_off(struct pwm_fan_ctx *ctx)
+{
struct pwm_state *state = &ctx->pwm_state;
+ state->enabled = false;
+ state->duty_cycle = 0;
+ pwm_apply_state(ctx->pwm, state);
+
+ return 0;
+}
+
+static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm)
+{
+ int ret = 0;
+
mutex_lock(&ctx->lock);
if (ctx->pwm_value == pwm)
goto exit_set_pwm_err;
- period = state->period;
- state->duty_cycle = DIV_ROUND_UP(pwm * (period - 1), MAX_PWM);
- state->enabled = pwm ? true : false;
+ if (pwm > 0)
+ ret = pwm_fan_power_on(ctx);
+ else
+ ret = pwm_fan_power_off(ctx);
- ret = pwm_apply_state(ctx->pwm, state);
if (!ret)
ctx->pwm_value = pwm;
+
exit_set_pwm_err:
mutex_unlock(&ctx->lock);
return ret;