Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752751AbbKPJBd (ORCPT ); Mon, 16 Nov 2015 04:01:33 -0500 Received: from down.free-electrons.com ([37.187.137.238]:34766 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752329AbbKPI5J (ORCPT ); Mon, 16 Nov 2015 03:57:09 -0500 From: Boris Brezillon To: Thierry Reding , linux-pwm@vger.kernel.org Cc: Mike Turquette , Stephen Boyd , linux-clk@vger.kernel.org, Mark Brown , Liam Girdwood , Kamil Debski , lm-sensors@lm-sensors.org, Jean Delvare , Guenter Roeck , Dmitry Torokhov , linux-input@vger.kernel.org, Bryan Wu , Richard Purdie , Jacek Anaszewski , linux-leds@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , linux-sunxi@googlegroups.com, Joachim Eastwood , Thomas Petazzoni , Heiko Stuebner , linux-rockchip@lists.infradead.org, Jingoo Han , Lee Jones , linux-fbdev@vger.kernel.org, Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Robert Jarzmik , Alexandre Belloni , Julia Lawall , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Boris Brezillon Subject: [PATCH v4 13/24] hwmon: pwm-fan: use pwm_get/set_default_xxx() helpers where appropriate Date: Mon, 16 Nov 2015 09:56:36 +0100 Message-Id: <1447664207-24370-14-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447664207-24370-1-git-send-email-boris.brezillon@free-electrons.com> References: <1447664207-24370-1-git-send-email-boris.brezillon@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2304 Lines: 61 pwm_set/get_default_xxx() helpers have been introduced to differentiate the default PWM states (those retrieved through DT, PWM lookup table or statically assigned by the driver) and the current ones. Make use of those helpers where appropriate. Signed-off-by: Boris Brezillon --- drivers/hwmon/pwm-fan.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/hwmon/pwm-fan.c b/drivers/hwmon/pwm-fan.c index 105b964..989d7b4 100644 --- a/drivers/hwmon/pwm-fan.c +++ b/drivers/hwmon/pwm-fan.c @@ -47,8 +47,9 @@ static int __set_pwm(struct pwm_fan_ctx *ctx, unsigned long pwm) if (ctx->pwm_value == pwm) goto exit_set_pwm_err; - duty = DIV_ROUND_UP(pwm * (pwm_get_period((ctx->pwm)) - 1), MAX_PWM); - ret = pwm_config(ctx->pwm, duty, pwm_get_period((ctx->pwm))); + duty = DIV_ROUND_UP(pwm * (pwm_get_default_period((ctx->pwm)) - 1), + MAX_PWM); + ret = pwm_config(ctx->pwm, duty, pwm_get_default_period((ctx->pwm))); if (ret) goto exit_set_pwm_err; @@ -234,10 +235,11 @@ static int pwm_fan_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); /* Set duty cycle to maximum allowed */ - duty_cycle = pwm_get_period((ctx->pwm)) - 1; + duty_cycle = pwm_get_default_period((ctx->pwm)) - 1; ctx->pwm_value = MAX_PWM; - ret = pwm_config(ctx->pwm, duty_cycle, pwm_get_period((ctx->pwm))); + ret = pwm_config(ctx->pwm, duty_cycle, + pwm_get_default_period((ctx->pwm))); if (ret) { dev_err(&pdev->dev, "Failed to configure PWM\n"); return ret; @@ -309,9 +311,10 @@ static int pwm_fan_resume(struct device *dev) if (ctx->pwm_value == 0) return 0; - duty = DIV_ROUND_UP(ctx->pwm_value * (pwm_get_period((ctx->pwm)) - 1), + duty = DIV_ROUND_UP(ctx->pwm_value * + (pwm_get_default_period((ctx->pwm)) - 1), MAX_PWM); - ret = pwm_config(ctx->pwm, duty, pwm_get_period((ctx->pwm))); + ret = pwm_config(ctx->pwm, duty, pwm_get_default_period((ctx->pwm))); if (ret) return ret; return pwm_enable(ctx->pwm); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/