Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755483AbcC3UPg (ORCPT ); Wed, 30 Mar 2016 16:15:36 -0400 Received: from down.free-electrons.com ([37.187.137.238]:45032 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754547AbcC3UFE (ORCPT ); Wed, 30 Mar 2016 16:05:04 -0400 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 , Kukjin Kim , Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula , Jonathan Corbet , linux-doc@vger.kernel.org, David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hartley Sweeten , Ryan Mallon , Alexander Shiyan , Milo Kim , Boris Brezillon Subject: [PATCH v5 19/46] pwm: switch to the atomic API Date: Wed, 30 Mar 2016 22:03:42 +0200 Message-Id: <1459368249-13241-20-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459368249-13241-1-git-send-email-boris.brezillon@free-electrons.com> References: <1459368249-13241-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: 5633 Lines: 203 Replace legacy pwm_get/set_xxx() and pwm_config/enable/disable() calls by pwm_get/apply_state(). Signed-off-by: Boris Brezillon --- drivers/pwm/core.c | 5 ++++- drivers/pwm/sysfs.c | 61 +++++++++++++++++++++++++++++++---------------------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 62e6b3c..c2b1569 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -882,13 +882,16 @@ static void pwm_dbg_show(struct pwm_chip *chip, struct seq_file *s) for (i = 0; i < chip->npwm; i++) { struct pwm_device *pwm = &chip->pwms[i]; + struct pwm_state pstate; + + pwm_get_state(pwm, &pstate); seq_printf(s, " pwm-%-3d (%-20.20s):", i, pwm->label); if (test_bit(PWMF_REQUESTED, &pwm->flags)) seq_puts(s, " requested"); - if (pwm_is_enabled(pwm)) + if (pstate.enabled) seq_puts(s, " enabled"); seq_puts(s, "\n"); diff --git a/drivers/pwm/sysfs.c b/drivers/pwm/sysfs.c index ab28c89..7ec1747 100644 --- a/drivers/pwm/sysfs.c +++ b/drivers/pwm/sysfs.c @@ -47,13 +47,13 @@ static ssize_t period_show(struct device *child, { struct pwm_export *export = child_to_pwm_export(child); const struct pwm_device *pwm = export->pwm; - unsigned int period; + struct pwm_state pstate; mutex_lock(&export->lock); - period = pwm_get_period(pwm); + pwm_get_state(pwm, &pstate); mutex_unlock(&export->lock); - return sprintf(buf, "%u\n", period); + return sprintf(buf, "%u\n", pstate.period); } static ssize_t period_store(struct device *child, @@ -62,6 +62,7 @@ static ssize_t period_store(struct device *child, { struct pwm_export *export = child_to_pwm_export(child); struct pwm_device *pwm = export->pwm; + struct pwm_state pstate; unsigned int val; int ret; @@ -70,7 +71,9 @@ static ssize_t period_store(struct device *child, return ret; mutex_lock(&export->lock); - ret = pwm_config(pwm, pwm_get_duty_cycle(pwm), val); + pwm_get_state(pwm, &pstate); + pstate.period = val; + ret = pwm_apply_state(pwm, &pstate); mutex_unlock(&export->lock); return ret ? : size; @@ -82,13 +85,13 @@ static ssize_t duty_cycle_show(struct device *child, { struct pwm_export *export = child_to_pwm_export(child); const struct pwm_device *pwm = export->pwm; - unsigned int duty; + struct pwm_state pstate; mutex_lock(&export->lock); - duty = pwm_get_duty_cycle(pwm); + pwm_get_state(pwm, &pstate); mutex_unlock(&export->lock); - return sprintf(buf, "%u\n", duty); + return sprintf(buf, "%u\n", pstate.duty_cycle); } static ssize_t duty_cycle_store(struct device *child, @@ -97,6 +100,7 @@ static ssize_t duty_cycle_store(struct device *child, { struct pwm_export *export = child_to_pwm_export(child); struct pwm_device *pwm = export->pwm; + struct pwm_state pstate; unsigned int val; int ret; @@ -105,7 +109,9 @@ static ssize_t duty_cycle_store(struct device *child, return ret; mutex_lock(&export->lock); - ret = pwm_config(pwm, val, pwm_get_period(pwm)); + pwm_get_state(pwm, &pstate); + pstate.duty_cycle = val; + ret = pwm_apply_state(pwm, &pstate); mutex_unlock(&export->lock); return ret ? : size; @@ -117,13 +123,13 @@ static ssize_t enable_show(struct device *child, { struct pwm_export *export = child_to_pwm_export(child); const struct pwm_device *pwm = export->pwm; - bool enabled; + struct pwm_state pstate; mutex_lock(&export->lock); - enabled = pwm_is_enabled(pwm); + pwm_get_state(pwm, &pstate); mutex_unlock(&export->lock); - return sprintf(buf, "%d\n", enabled); + return sprintf(buf, "%d\n", pstate.enabled); } static ssize_t enable_store(struct device *child, @@ -132,24 +138,20 @@ static ssize_t enable_store(struct device *child, { struct pwm_export *export = child_to_pwm_export(child); struct pwm_device *pwm = export->pwm; + struct pwm_state pstate; int val, ret; ret = kstrtoint(buf, 0, &val); if (ret) return ret; + if (val != 0 && val != 1) + return -EINVAL; + mutex_lock(&export->lock); - switch (val) { - case 0: - pwm_disable(pwm); - break; - case 1: - ret = pwm_enable(pwm); - break; - default: - ret = -EINVAL; - break; - } + pwm_get_state(pwm, &pstate); + pstate.enabled = val; + ret = pwm_apply_state(pwm, &pstate); mutex_unlock(&export->lock); return ret ? : size; @@ -162,9 +164,13 @@ static ssize_t polarity_show(struct device *child, struct pwm_export *export = child_to_pwm_export(child); const struct pwm_device *pwm = export->pwm; const char *polarity = "unknown"; + struct pwm_state pstate; mutex_lock(&export->lock); - switch (pwm_get_polarity(pwm)) { + pwm_get_state(pwm, &pstate); + mutex_unlock(&export->lock); + + switch (pstate.polarity) { case PWM_POLARITY_NORMAL: polarity = "normal"; break; @@ -173,7 +179,6 @@ static ssize_t polarity_show(struct device *child, polarity = "inversed"; break; } - mutex_unlock(&export->lock); return sprintf(buf, "%s\n", polarity); } @@ -185,6 +190,7 @@ static ssize_t polarity_store(struct device *child, struct pwm_export *export = child_to_pwm_export(child); struct pwm_device *pwm = export->pwm; enum pwm_polarity polarity; + struct pwm_state pstate; int ret; if (sysfs_streq(buf, "normal")) @@ -195,7 +201,12 @@ static ssize_t polarity_store(struct device *child, return -EINVAL; mutex_lock(&export->lock); - ret = pwm_set_polarity(pwm, polarity); + pwm_get_state(pwm, &pstate); + pstate.polarity = polarity; + if (pstate.enabled) + ret = -EBUSY; + else + ret = pwm_apply_state(pwm, &pstate); mutex_unlock(&export->lock); return ret ? : size; -- 2.5.0