From patchwork Wed Mar 30 20:03:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris BREZILLON X-Patchwork-Id: 8704921 Return-Path: X-Original-To: patchwork-linux-arm@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 C009FC0553 for ; Wed, 30 Mar 2016 20:27:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D73DF20361 for ; Wed, 30 Mar 2016 20:27:15 +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 09331201EF for ; Wed, 30 Mar 2016 20:27:15 +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 1alMgQ-0002my-UE; Wed, 30 Mar 2016 20:25:42 +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 1alMN7-0005AO-JA; Wed, 30 Mar 2016 20:05:50 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 8A38F1CBF; Wed, 30 Mar 2016 22:05:44 +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 66C7C1832; Wed, 30 Mar 2016 22:05:21 +0200 (CEST) From: Boris Brezillon To: Thierry Reding , linux-pwm@vger.kernel.org Subject: [PATCH v5 36/46] input: misc: max77693: switch to the atomic API Date: Wed, 30 Mar 2016 22:03:59 +0200 Message-Id: <1459368249-13241-37-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_130546_239817_93EC7D26 X-CRM114-Status: GOOD ( 15.05 ) X-Spam-Score: -2.9 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: 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-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=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/max77693-haptic.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/input/misc/max77693-haptic.c b/drivers/input/misc/max77693-haptic.c index cf6aac0..aef7dc4 100644 --- a/drivers/input/misc/max77693-haptic.c +++ b/drivers/input/misc/max77693-haptic.c @@ -70,13 +70,16 @@ struct max77693_haptic { static int max77693_haptic_set_duty_cycle(struct max77693_haptic *haptic) { + struct pwm_state pstate; struct pwm_args pargs = { }; - int delta; int error; pwm_get_args(haptic->pwm_dev, &pargs); - delta = (pargs.period + haptic->pwm_duty) / 2; - error = pwm_config(haptic->pwm_dev, delta, pargs.period); + pwm_get_state(haptic->pwm_dev, &pstate); + + pstate.period = pargs.period; + pstate.duty_cycle = (pargs.period + haptic->pwm_duty) / 2; + error = pwm_apply_state(haptic->pwm_dev, &pstate); if (error) { dev_err(haptic->dev, "failed to configure pwm: %d\n", error); return error; @@ -161,12 +164,16 @@ static int max77693_haptic_lowsys(struct max77693_haptic *haptic, bool enable) static void max77693_haptic_enable(struct max77693_haptic *haptic) { + struct pwm_state pstate; int error; if (haptic->enabled) return; - error = pwm_enable(haptic->pwm_dev); + pwm_get_state(haptic->pwm_dev, &pstate); + pstate.enabled = true; + + error = pwm_apply_state(haptic->pwm_dev, &pstate); if (error) { dev_err(haptic->dev, "failed to enable haptic pwm device: %d\n", error); @@ -188,11 +195,13 @@ static void max77693_haptic_enable(struct max77693_haptic *haptic) err_enable_config: max77693_haptic_lowsys(haptic, false); err_enable_lowsys: - pwm_disable(haptic->pwm_dev); + pstate.enabled = false; + pwm_apply_state(haptic->pwm_dev, &pstate); } static void max77693_haptic_disable(struct max77693_haptic *haptic) { + struct pwm_state pstate; int error; if (!haptic->enabled) @@ -206,7 +215,9 @@ static void max77693_haptic_disable(struct max77693_haptic *haptic) if (error) goto err_disable_lowsys; - pwm_disable(haptic->pwm_dev); + pwm_get_state(haptic->pwm_dev, &pstate); + pstate.enabled = false; + pwm_apply_state(haptic->pwm_dev, &pstate); haptic->enabled = false; return;