lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 30 Mar 2016 22:03:59 +0200 From: Boris Brezillon <boris.brezillon@...e-electrons.com> To: Thierry Reding <thierry.reding@...il.com>, linux-pwm@...r.kernel.org Cc: Mike Turquette <mturquette@...libre.com>, Stephen Boyd <sboyd@...eaurora.org>, linux-clk@...r.kernel.org, Mark Brown <broonie@...nel.org>, Liam Girdwood <lgirdwood@...il.com>, Kamil Debski <k.debski@...sung.com>, lm-sensors@...sensors.org, Jean Delvare <jdelvare@...e.com>, Guenter Roeck <linux@...ck-us.net>, Dmitry Torokhov <dmitry.torokhov@...il.com>, linux-input@...r.kernel.org, Bryan Wu <cooloney@...il.com>, Richard Purdie <rpurdie@...ys.net>, Jacek Anaszewski <j.anaszewski@...sung.com>, linux-leds@...r.kernel.org, Maxime Ripard <maxime.ripard@...e-electrons.com>, Chen-Yu Tsai <wens@...e.org>, linux-sunxi@...glegroups.com, Joachim Eastwood <manabian@...il.com>, Thomas Petazzoni <thomas.petazzoni@...e-electrons.com>, Heiko Stuebner <heiko@...ech.de>, linux-rockchip@...ts.infradead.org, Jingoo Han <jingoohan1@...il.com>, Lee Jones <lee.jones@...aro.org>, linux-fbdev@...r.kernel.org, Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>, Tomi Valkeinen <tomi.valkeinen@...com>, Robert Jarzmik <robert.jarzmik@...e.fr>, Alexandre Belloni <alexandre.belloni@...e-electrons.com>, Kukjin Kim <kgene@...nel.org>, Krzysztof Kozlowski <k.kozlowski@...sung.com>, linux-samsung-soc@...r.kernel.org, intel-gfx@...ts.freedesktop.org, Daniel Vetter <daniel.vetter@...el.com>, Jani Nikula <jani.nikula@...ux.intel.com>, Jonathan Corbet <corbet@....net>, linux-doc@...r.kernel.org, David Airlie <airlied@...ux.ie>, Daniel Vetter <daniel@...ll.ch>, dri-devel@...ts.freedesktop.org, linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org, Hartley Sweeten <hsweeten@...ionengravers.com>, Ryan Mallon <rmallon@...il.com>, Alexander Shiyan <shc_work@...l.ru>, Milo Kim <milo.kim@...com>, Boris Brezillon <boris.brezillon@...e-electrons.com> Subject: [PATCH v5 36/46] input: misc: max77693: switch to the atomic API pwm_config/enable/disable() have been deprecated and should be replaced by pwm_apply_state(). Signed-off-by: Boris Brezillon <boris.brezillon@...e-electrons.com> --- 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; -- 2.5.0
Powered by blists - more mailing lists