| Message ID | 1498739271-27431-3-git-send-email-david.wu@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 29 Jun 2017 20:27:48 +0800 David Wu <david.wu@rock-chips.com> wrote: > It seems the rockchip_pwm_config always returns the result 0, > so remove the judge. > > Signed-off-by: David Wu <david.wu@rock-chips.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > --- > drivers/pwm/pwm-rockchip.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c > index 617824c..cd45f17 100644 > --- a/drivers/pwm/pwm-rockchip.c > +++ b/drivers/pwm/pwm-rockchip.c > @@ -165,7 +165,7 @@ static void rockchip_pwm_get_state(struct pwm_chip *chip, > clk_disable(pc->pclk); > } > > -static int rockchip_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, > +static void rockchip_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, > int duty_ns, int period_ns) > { > struct rockchip_pwm_chip *pc = to_rockchip_pwm_chip(chip); > @@ -188,8 +188,6 @@ static int rockchip_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, > > writel(period, pc->base + pc->data->regs.period); > writel(duty, pc->base + pc->data->regs.duty); > - > - return 0; > } > > static int rockchip_pwm_enable(struct pwm_chip *chip, > @@ -236,13 +234,7 @@ static int rockchip_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, > enabled = false; > } > > - ret = rockchip_pwm_config(chip, pwm, state->duty_cycle, state->period); > - if (ret) { > - if (enabled != curstate.enabled) > - rockchip_pwm_enable(chip, pwm, !enabled, > - state->polarity); > - goto out; > - } > + rockchip_pwm_config(chip, pwm, state->duty_cycle, state->period); > > if (state->enabled != enabled) { > ret = rockchip_pwm_enable(chip, pwm, state->enabled,
diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c index 617824c..cd45f17 100644 --- a/drivers/pwm/pwm-rockchip.c +++ b/drivers/pwm/pwm-rockchip.c @@ -165,7 +165,7 @@ static void rockchip_pwm_get_state(struct pwm_chip *chip, clk_disable(pc->pclk); } -static int rockchip_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, +static void rockchip_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, int duty_ns, int period_ns) { struct rockchip_pwm_chip *pc = to_rockchip_pwm_chip(chip); @@ -188,8 +188,6 @@ static int rockchip_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, writel(period, pc->base + pc->data->regs.period); writel(duty, pc->base + pc->data->regs.duty); - - return 0; } static int rockchip_pwm_enable(struct pwm_chip *chip, @@ -236,13 +234,7 @@ static int rockchip_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, enabled = false; } - ret = rockchip_pwm_config(chip, pwm, state->duty_cycle, state->period); - if (ret) { - if (enabled != curstate.enabled) - rockchip_pwm_enable(chip, pwm, !enabled, - state->polarity); - goto out; - } + rockchip_pwm_config(chip, pwm, state->duty_cycle, state->period); if (state->enabled != enabled) { ret = rockchip_pwm_enable(chip, pwm, state->enabled,
It seems the rockchip_pwm_config always returns the result 0, so remove the judge. Signed-off-by: David Wu <david.wu@rock-chips.com> --- drivers/pwm/pwm-rockchip.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)