From patchwork Wed Mar 30 20:04:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris BREZILLON X-Patchwork-Id: 8858791 Return-Path: X-Original-To: patchwork-linux-rockchip@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8D3D4BF440 for ; Fri, 15 Apr 2016 20:59:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A513120295 for ; Fri, 15 Apr 2016 20:59:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B2A97202A1 for ; Fri, 15 Apr 2016 20:59:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1arApR-0000oW-Br; Fri, 15 Apr 2016 20:59:01 +0000 Received: from down.free-electrons.com ([37.187.137.238] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1alMNC-0005K6-VA; Wed, 30 Mar 2016 20:05:53 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 0CB2B1CC3; Wed, 30 Mar 2016 22:05:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (LFbn-1-2159-240.w90-76.abo.wanadoo.fr [90.76.216.240]) by mail.free-electrons.com (Postfix) with ESMTPSA id EBD981816; Wed, 30 Mar 2016 22:05:24 +0200 (CEST) From: Boris Brezillon To: Thierry Reding , linux-pwm@vger.kernel.org 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160330_130551_726134_13353EC1 X-CRM114-Status: GOOD ( 16.13 ) X-Spam-Score: -2.9 (--) X-Mailman-Approved-At: Fri, 15 Apr 2016 13:58:40 -0700 X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Milo Kim , Kamil Debski , Heiko Stuebner , linux-doc@vger.kernel.org, David Airlie , Mike Turquette , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Alexandre Belloni , Daniel Vetter , Lee Jones , linux-clk@vger.kernel.org, linux-leds@vger.kernel.org, Boris Brezillon , Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, Alexander Shiyan , Jonathan Corbet , Robert Jarzmik , lm-sensors@lm-sensors.org, linux-rockchip@lists.infradead.org, Chen-Yu Tsai , Tomi Valkeinen , linux-input@vger.kernel.org, Jean-Christophe Plagniol-Villard , intel-gfx@lists.freedesktop.org, Guenter Roeck , Jean Delvare , Joachim Eastwood , Bryan Wu , Jani Nikula , Mark Brown , Jacek Anaszewski , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , Ryan Mallon , Jingoo Han , Dmitry Torokhov , Stephen Boyd , Liam Girdwood , Hartley Sweeten , Richard Purdie , Kukjin Kim , Daniel Vetter , Maxime Ripard MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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;