[PATCH v4 14/24] clk: pwm: use pwm_get/set_default_xxx() helpers where appropriate
From: Boris Brezillon <hidden>
Date: 2015-11-16 09:00:38
Also in:
linux-arm-kernel, linux-clk, linux-fbdev, linux-leds, linux-pwm, linux-rockchip, lkml
Subsystem:
common clk framework, the rest · Maintainers:
Michael Turquette, Stephen Boyd, Linus Torvalds
pwm_set/get_default_xxx() helpers have been introduced to differentiate the default PWM states (those retrieved through DT, PWM lookup table or statically assigned by the driver) and the current ones. Make use of those helpers where appropriate. Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> --- drivers/clk/clk-pwm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/clk-pwm.c b/drivers/clk/clk-pwm.c
index b6306a2..642a49a 100644
--- a/drivers/clk/clk-pwm.c
+++ b/drivers/clk/clk-pwm.c@@ -71,23 +71,23 @@ static int clk_pwm_probe(struct platform_device *pdev) if (IS_ERR(pwm)) return PTR_ERR(pwm); - if (!pwm_get_period((pwm))) { + if (!pwm_get_default_period((pwm))) { dev_err(&pdev->dev, "invalid PWM period\n"); return -EINVAL; } if (of_property_read_u32(node, "clock-frequency", &clk_pwm->fixed_rate)) - clk_pwm->fixed_rate = NSEC_PER_SEC / pwm_get_period((pwm)); + clk_pwm->fixed_rate = NSEC_PER_SEC / pwm_get_default_period((pwm)); - if (pwm_get_period((pwm)) != NSEC_PER_SEC / clk_pwm->fixed_rate && - pwm_get_period((pwm)) != DIV_ROUND_UP(NSEC_PER_SEC, clk_pwm->fixed_rate)) { + if (pwm_get_default_period((pwm)) != NSEC_PER_SEC / clk_pwm->fixed_rate && + pwm_get_default_period((pwm)) != DIV_ROUND_UP(NSEC_PER_SEC, clk_pwm->fixed_rate)) { dev_err(&pdev->dev, "clock-frequency does not match PWM period\n"); return -EINVAL; } - ret = pwm_config(pwm, (pwm_get_period((pwm)) + 1) >> 1, - pwm_get_period((pwm))); + ret = pwm_config(pwm, (pwm_get_default_period((pwm)) + 1) >> 1, + pwm_get_default_period((pwm))); if (ret < 0) return ret;
--
2.1.4