From patchwork Tue Jan 12 19:13:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 12014611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D91D4C433E9 for ; Tue, 12 Jan 2021 19:14:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 849A12311F for ; Tue, 12 Jan 2021 19:14:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392300AbhALTOJ (ORCPT ); Tue, 12 Jan 2021 14:14:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732921AbhALTOI (ORCPT ); Tue, 12 Jan 2021 14:14:08 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EC6CC061794 for ; Tue, 12 Jan 2021 11:13:28 -0800 (PST) Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kzP6Y-0004zm-UZ; Tue, 12 Jan 2021 20:13:22 +0100 Received: from ukl by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1kzP6W-0002Ve-2U; Tue, 12 Jan 2021 20:13:20 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Bartlomiej Zolnierkiewicz , Jean Delvare , Guenter Roeck Cc: linux-hwmon@vger.kernel.org, linux-pwm@vger.kernel.org, Thierry Reding , Lee Jones , kernel@pengutronix.de, Paul Barker Subject: [PATCH] hwmon: pwm-fan: stop using legacy PWM functions and some cleanups Date: Tue, 12 Jan 2021 20:13:14 +0100 Message-Id: <20210112191314.124686-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201230163520.GA103560@roeck-us.net> References: <20201230163520.GA103560@roeck-us.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-hwmon@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hwmon@vger.kernel.org pwm_apply_state() does what the legacy functions pwm_config() and pwm_{en,dis}able() do in a single function call. This simplifies error handling and is more efficient for new-style PWM hardware drivers. Instead of repeatedly querying the PWM framework about the initial PWM configuration, cache the settings in driver data. Also use __set_pwm() in .probe() to have the algorithm calculating the PWM state in a single place. Signed-off-by: Uwe Kleine-König --- On Wed, Dec 30, 2020 at 08:35:20AM -0800, Guenter Roeck wrote: > Can you rebase this patch on top of hwmon-next ? Sure, here it is. Best regards Uwe drivers/hwmon/pwm-fan.c | 47 +++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 28 deletions(-) base-commit: d1f7b079ce5b69c88c813439eea6a9c133f0846b diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index b5204aeb8085..41cb829784a2 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -31,6 +31,7 @@ struct pwm_fan_tach { struct pwm_fan_ctx { struct mutex lock; struct pwm_device *pwm; + struct pwm_state pwm_state; struct regulator *reg_en; int tach_count; @@ -95,18 +96,17 @@ static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm) { unsigned long period; int ret = 0; - struct pwm_state state = { }; + struct pwm_state *state = &ctx->pwm_state; mutex_lock(&ctx->lock); if (ctx->pwm_value == pwm) goto exit_set_pwm_err; - pwm_init_state(ctx->pwm, &state); - period = ctx->pwm->args.period; - state.duty_cycle = DIV_ROUND_UP(pwm * (period - 1), MAX_PWM); - state.enabled = pwm ? true : false; + period = state->period; + state->duty_cycle = DIV_ROUND_UP(pwm * (period - 1), MAX_PWM); + state->enabled = pwm ? true : false; - ret = pwm_apply_state(ctx->pwm, &state); + ret = pwm_apply_state(ctx->pwm, state); if (!ret) ctx->pwm_value = pwm; exit_set_pwm_err: @@ -288,7 +288,9 @@ static void pwm_fan_regulator_disable(void *data) static void pwm_fan_pwm_disable(void *__ctx) { struct pwm_fan_ctx *ctx = __ctx; - pwm_disable(ctx->pwm); + + ctx->pwm_state.enabled = false; + pwm_apply_state(ctx->pwm, &ctx->pwm_state); del_timer_sync(&ctx->rpm_timer); } @@ -299,7 +301,6 @@ static int pwm_fan_probe(struct platform_device *pdev) struct pwm_fan_ctx *ctx; struct device *hwmon; int ret; - struct pwm_state state = { }; const struct hwmon_channel_info **channels; u32 *fan_channel_config; int channel_count = 1; /* We always have a PWM channel. */ @@ -337,22 +338,20 @@ static int pwm_fan_probe(struct platform_device *pdev) ctx->pwm_value = MAX_PWM; - pwm_init_state(ctx->pwm, &state); + pwm_init_state(ctx->pwm, &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 (state.period > ULONG_MAX / MAX_PWM + 1) { + if (ctx->pwm_state.period > ULONG_MAX / MAX_PWM + 1) { dev_err(dev, "Configured period too big\n"); return -EINVAL; } /* Set duty cycle to maximum allowed and enable PWM output */ - state.duty_cycle = ctx->pwm->args.period - 1; - state.enabled = true; - - ret = pwm_apply_state(ctx->pwm, &state); + ret = __set_pwm(ctx, MAX_PWM); if (ret) { dev_err(dev, "Failed to configure PWM: %d\n", ret); return ret; @@ -468,17 +467,16 @@ static int pwm_fan_probe(struct platform_device *pdev) static int pwm_fan_disable(struct device *dev) { struct pwm_fan_ctx *ctx = dev_get_drvdata(dev); - struct pwm_args args; int ret; - pwm_get_args(ctx->pwm, &args); - if (ctx->pwm_value) { - ret = pwm_config(ctx->pwm, 0, args.period); + /* keep ctx->pwm_state unmodified for pwm_fan_resume() */ + struct pwm_state state = ctx->pwm_state; + state.duty_cycle = 0; + state.enabled = false; + ret = pwm_apply_state(ctx->pwm, &state); if (ret < 0) return ret; - - pwm_disable(ctx->pwm); } if (ctx->reg_en) { @@ -506,8 +504,6 @@ static int pwm_fan_suspend(struct device *dev) static int pwm_fan_resume(struct device *dev) { struct pwm_fan_ctx *ctx = dev_get_drvdata(dev); - struct pwm_args pargs; - unsigned long duty; int ret; if (ctx->reg_en) { @@ -521,12 +517,7 @@ static int pwm_fan_resume(struct device *dev) if (ctx->pwm_value == 0) return 0; - pwm_get_args(ctx->pwm, &pargs); - duty = DIV_ROUND_UP_ULL(ctx->pwm_value * (pargs.period - 1), MAX_PWM); - ret = pwm_config(ctx->pwm, duty, pargs.period); - if (ret) - return ret; - return pwm_enable(ctx->pwm); + return pwm_apply_state(ctx->pwm, &ctx->pwm_state); } #endif