Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756028AbcC3UId (ORCPT ); Wed, 30 Mar 2016 16:08:33 -0400 Received: from down.free-electrons.com ([37.187.137.238]:45754 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755506AbcC3UFx (ORCPT ); Wed, 30 Mar 2016 16:05:53 -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 38/46] input: misc: pwm-beeper: switch to the atomic PWM API Date: Wed, 30 Mar 2016 22:04:01 +0200 Message-Id: <1459368249-13241-39-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: 2713 Lines: 102 pwm_config/enable/disable() have been deprecated and should be replaced by pwm_apply_state(). Signed-off-by: Boris Brezillon --- drivers/input/misc/pwm-beeper.c | 46 +++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/drivers/input/misc/pwm-beeper.c b/drivers/input/misc/pwm-beeper.c index f2261ab..36c9897 100644 --- a/drivers/input/misc/pwm-beeper.c +++ b/drivers/input/misc/pwm-beeper.c @@ -34,7 +34,7 @@ static int pwm_beeper_event(struct input_dev *input, { int ret = 0; struct pwm_beeper *beeper = input_get_drvdata(input); - unsigned long period; + struct pwm_state pstate; if (type != EV_SND || value < 0) return -EINVAL; @@ -49,19 +49,22 @@ static int pwm_beeper_event(struct input_dev *input, return -EINVAL; } + pwm_get_state(beeper->pwm, &pstate); + if (value == 0) { - pwm_disable(beeper->pwm); + pstate.enabled = false; } else { - period = HZ_TO_NANOSECONDS(value); - ret = pwm_config(beeper->pwm, period / 2, period); - if (ret) - return ret; - ret = pwm_enable(beeper->pwm); - if (ret) - return ret; - beeper->period = period; + pstate.enabled = false; + pstate.period = HZ_TO_NANOSECONDS(value); + pstate.duty_cycle = pstate.period / 2; } + ret = pwm_apply_state(beeper->pwm, &pstate); + if (ret) + return ret; + + beeper->period = value ? pstate.period : 0; + return 0; } @@ -132,10 +135,13 @@ err_free: static int pwm_beeper_remove(struct platform_device *pdev) { struct pwm_beeper *beeper = platform_get_drvdata(pdev); + struct pwm_state pstate; input_unregister_device(beeper->input); - pwm_disable(beeper->pwm); + pwm_get_state(beeper->pwm, &pstate); + pstate.enabled = false; + pwm_apply_state(beeper->pwm, &pstate); pwm_free(beeper->pwm); kfree(beeper); @@ -147,8 +153,13 @@ static int __maybe_unused pwm_beeper_suspend(struct device *dev) { struct pwm_beeper *beeper = dev_get_drvdata(dev); - if (beeper->period) - pwm_disable(beeper->pwm); + if (beeper->period) { + struct pwm_state pstate; + + pwm_get_state(beeper->pwm, &pstate); + pstate.enabled = false; + pwm_apply_state(beeper->pwm, &pstate); + } return 0; } @@ -158,8 +169,13 @@ static int __maybe_unused pwm_beeper_resume(struct device *dev) struct pwm_beeper *beeper = dev_get_drvdata(dev); if (beeper->period) { - pwm_config(beeper->pwm, beeper->period / 2, beeper->period); - pwm_enable(beeper->pwm); + struct pwm_state pstate; + + pwm_get_state(beeper->pwm, &pstate); + pstate.period = beeper->period; + pstate.duty_cycle = beeper->period / 2; + pstate.enabled = true; + pwm_apply_state(beeper->pwm, &pstate); } return 0; -- 2.5.0