Each pwm device has already a pwm_state. Use this one instead of
managing an own copy of it.
Signed-off-by: Alexander Stein <alexander.stein@xxxxxxxxxxxxxxx>
---
drivers/hwmon/pwm-fan.c | 49 +++++++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c
index e5d4b3b1cc49..e0ce81cdf5e0 100644
--- a/drivers/hwmon/pwm-fan.c
+++ b/drivers/hwmon/pwm-fan.c
@@ -40,7 +40,6 @@ struct pwm_fan_ctx {
struct mutex lock;
struct pwm_device *pwm;
- struct pwm_state pwm_state;
struct regulator *reg_en;
enum pwm_fan_enable_mode enable_mode;
bool regulator_enabled;
@@ -142,7 +141,7 @@ static int pwm_fan_switch_power(struct pwm_fan_ctx *ctx, bool on)
static int pwm_fan_power_on(struct pwm_fan_ctx *ctx)
{
- struct pwm_state *state = &ctx->pwm_state;
+ struct pwm_state state;
int ret;
if (ctx->enabled)
@@ -154,8 +153,9 @@ static int pwm_fan_power_on(struct pwm_fan_ctx *ctx)
return ret;
}
- state->enabled = true;
- ret = pwm_apply_state(ctx->pwm, state);
+ pwm_get_state(ctx->pwm, &state);
+ state.enabled = true;
+ ret = pwm_apply_state(ctx->pwm, &state);
if (ret) {
dev_err(ctx->dev, "failed to enable PWM\n");
goto disable_regulator;
@@ -172,19 +172,20 @@ static int pwm_fan_power_on(struct pwm_fan_ctx *ctx)
static int pwm_fan_power_off(struct pwm_fan_ctx *ctx)
{
- struct pwm_state *state = &ctx->pwm_state;
bool enable_regulator = false;
+ struct pwm_state state;
if (!ctx->enabled)
return 0;
pwm_fan_enable_mode_2_state(ctx->enable_mode,
- state,
+ &state,
&enable_regulator);
- state->enabled = false;
- state->duty_cycle = 0;
- pwm_apply_state(ctx->pwm, state);
+ pwm_get_state(ctx->pwm, &state);
+ state.enabled = false;
+ state.duty_cycle = 0;
+ pwm_apply_state(ctx->pwm, &state);
pwm_fan_switch_power(ctx, enable_regulator);
@@ -195,7 +196,7 @@ static int pwm_fan_power_off(struct pwm_fan_ctx *ctx)
static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm)
{
- struct pwm_state *state = &ctx->pwm_state;
+ struct pwm_state state;
unsigned long period;
int ret = 0;
@@ -204,9 +205,10 @@ static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm)
/* pwm-fan hard disabled */
return 0;
- period = state->period;
- state->duty_cycle = DIV_ROUND_UP(pwm * (period - 1), MAX_PWM);
- ret = pwm_apply_state(ctx->pwm, state);
+ pwm_get_state(ctx->pwm, &state);
+ period = state.period;
+ state.duty_cycle = DIV_ROUND_UP(pwm * (period - 1), MAX_PWM);
+ ret = pwm_apply_state(ctx->pwm, &state);
if (ret)
return ret;
ret = pwm_fan_power_on(ctx);
@@ -266,15 +268,16 @@ static int pwm_fan_update_enable(struct pwm_fan_ctx *ctx, long val)
* Nothing to do if currently enabled
*/
if (!ctx->enabled) {
- struct pwm_state *state = &ctx->pwm_state;
bool enable_regulator = false;
+ struct pwm_state state;
- state->duty_cycle = 0;
+ pwm_get_state(ctx->pwm, &state);
+ state.duty_cycle = 0;
pwm_fan_enable_mode_2_state(val,
- state,
+ &state,
&enable_regulator);
- pwm_apply_state(ctx->pwm, state);
+ pwm_apply_state(ctx->pwm, &state);
pwm_fan_switch_power(ctx, enable_regulator);
pwm_fan_update_state(ctx, 0);
}
@@ -473,6 +476,7 @@ static int pwm_fan_probe(struct platform_device *pdev)
struct thermal_cooling_device *cdev;
struct device *dev = &pdev->dev;
struct pwm_fan_ctx *ctx;
+ struct pwm_state state;
struct device *hwmon;
int ret;
const struct hwmon_channel_info **channels;
@@ -501,18 +505,25 @@ static int pwm_fan_probe(struct platform_device *pdev)
ctx->reg_en = NULL;
}
- pwm_init_state(ctx->pwm, &ctx->pwm_state);
+ pwm_init_state(ctx->pwm, &state);
/*
* set_pwm assumes that MAX_PWM * (period - 1) fits into an unsigned
* long. Check this here to prevent the fan running at a too low
* frequency.
*/
- if (ctx->pwm_state.period > ULONG_MAX / MAX_PWM + 1) {
+ if (state.period > ULONG_MAX / MAX_PWM + 1) {
dev_err(dev, "Configured period too big\n");
return -EINVAL;
}
+ /* Apply modified PWM default state */
+ ret = pwm_apply_state(ctx->pwm, &state);
+ if (ret) {
+ dev_err(dev, "failed to apply initial PWM state: %d\n", ret);
+ return -EINVAL;
+ }
+
ctx->enable_mode = pwm_disable_reg_enable;
/*
--
2.25.1
