lkml.org 
[lkml]   [2016]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v5 33/46] pwm: replace pwm_disable() by pwm_apply_state()
Date
Some PWM drivers are calling the deprecated pwm_disable() function in
their pwm->free() or pdev->remove() function. Replace those calls by
the pwm_apply_state().

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/pwm/pwm-lpc18xx-sct.c | 7 +++++--
drivers/pwm/pwm-lpc32xx.c | 9 +++++++--
drivers/pwm/pwm-spear.c | 9 +++++++--
drivers/pwm/pwm-sti.c | 9 +++++++--
4 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/drivers/pwm/pwm-lpc18xx-sct.c b/drivers/pwm/pwm-lpc18xx-sct.c
index 19dc64c..c4d7cb1 100644
--- a/drivers/pwm/pwm-lpc18xx-sct.c
+++ b/drivers/pwm/pwm-lpc18xx-sct.c
@@ -305,9 +305,12 @@ static void lpc18xx_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
{
struct lpc18xx_pwm_chip *lpc18xx_pwm = to_lpc18xx_pwm_chip(chip);
struct lpc18xx_pwm_data *lpc18xx_data = pwm_get_chip_data(pwm);
+ struct pwm_state pstate;

- pwm_disable(pwm);
- pwm_set_duty_cycle(pwm, 0);
+ pwm_get_state(pwm, &pstate);
+ pstate.duty_cycle = 0;
+ pstate.enabled = false;
+ pwm_apply_state(pwm, &pstate);
clear_bit(lpc18xx_data->duty_event, &lpc18xx_pwm->event_map);
}

diff --git a/drivers/pwm/pwm-lpc32xx.c b/drivers/pwm/pwm-lpc32xx.c
index 4d470c1..95870e0 100644
--- a/drivers/pwm/pwm-lpc32xx.c
+++ b/drivers/pwm/pwm-lpc32xx.c
@@ -138,8 +138,13 @@ static int lpc32xx_pwm_remove(struct platform_device *pdev)
struct lpc32xx_pwm_chip *lpc32xx = platform_get_drvdata(pdev);
unsigned int i;

- for (i = 0; i < lpc32xx->chip.npwm; i++)
- pwm_disable(&lpc32xx->chip.pwms[i]);
+ for (i = 0; i < lpc32xx->chip.npwm; i++) {
+ struct pwm_state pstate;
+
+ pwm_get_state(&lpc32xx->chip.pwms[i], &pstate);
+ pstate.enabled = false;
+ pwm_apply_state(&lpc32xx->chip.pwms[i], &pstate);
+ }

return pwmchip_remove(&lpc32xx->chip);
}
diff --git a/drivers/pwm/pwm-spear.c b/drivers/pwm/pwm-spear.c
index 6c6b44f..2ee4cd5 100644
--- a/drivers/pwm/pwm-spear.c
+++ b/drivers/pwm/pwm-spear.c
@@ -233,8 +233,13 @@ static int spear_pwm_remove(struct platform_device *pdev)
struct spear_pwm_chip *pc = platform_get_drvdata(pdev);
int i;

- for (i = 0; i < NUM_PWM; i++)
- pwm_disable(&pc->chip.pwms[i]);
+ for (i = 0; i < NUM_PWM; i++) {
+ struct pwm_state pstate;
+
+ pwm_get_state(&pc->chip.pwms[i], &pstate);
+ pstate.enabled = false;
+ pwm_apply_state(&pc->chip.pwms[i], &pstate);
+ }

/* clk was prepared in probe, hence unprepare it here */
clk_unprepare(pc->clk);
diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index bea1d17..0ec44a8 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -435,8 +435,13 @@ static int sti_pwm_remove(struct platform_device *pdev)
struct sti_pwm_chip *pc = platform_get_drvdata(pdev);
unsigned int i;

- for (i = 0; i < pc->cdata->num_chan; i++)
- pwm_disable(&pc->chip.pwms[i]);
+ for (i = 0; i < pc->cdata->num_chan; i++) {
+ struct pwm_state pstate;
+
+ pwm_get_state(&pc->chip.pwms[i], &pstate);
+ pstate.enabled = false;
+ pwm_apply_state(&pc->chip.pwms[i], &pstate);
+ }

clk_unprepare(pc->clk);

--
2.5.0
\
 
 \ /
  Last update: 2016-03-30 22:21    [W:0.345 / U:0.772 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site