From: David Wu <david.wu@rock-chips.com> To: thierry.reding@gmail.com, heiko@sntech.de, boris.brezillon@free-electrons.com, robh+dt@kernel.org Cc: catalin.marinas@arm.com, briannorris@chromium.org, dianders@chromium.org, mark.rutland@arm.com, huangtao@rock-chips.com, linux-pwm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, David Wu <david.wu@rock-chips.com> Subject: [PATCH 2/5] pwm: rockchip: Remove the judge from return value of rockchip_pwm_config() Date: Thu, 29 Jun 2017 20:27:48 +0800 [thread overview] Message-ID: <1498739271-27431-3-git-send-email-david.wu@rock-chips.com> (raw) In-Reply-To: <1498739271-27431-1-git-send-email-david.wu@rock-chips.com> 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(-) 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, -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: david.wu@rock-chips.com (David Wu) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/5] pwm: rockchip: Remove the judge from return value of rockchip_pwm_config() Date: Thu, 29 Jun 2017 20:27:48 +0800 [thread overview] Message-ID: <1498739271-27431-3-git-send-email-david.wu@rock-chips.com> (raw) In-Reply-To: <1498739271-27431-1-git-send-email-david.wu@rock-chips.com> 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(-) 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, -- 1.9.1
next prev parent reply other threads:[~2017-06-29 12:25 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-29 12:27 [PATCH 0/5] Add rk3328 pwm support David Wu 2017-06-29 12:27 ` David Wu 2017-06-29 12:27 ` David Wu 2017-06-29 12:27 ` [PATCH 1/5] pwm: rockchip: Add APB and function both clocks support David Wu 2017-06-29 12:27 ` David Wu 2017-06-29 12:27 ` David Wu 2017-07-06 17:12 ` Rob Herring 2017-07-06 17:12 ` Rob Herring 2017-07-06 17:12 ` Rob Herring 2017-06-29 12:27 ` David Wu [this message] 2017-06-29 12:27 ` [PATCH 2/5] pwm: rockchip: Remove the judge from return value of rockchip_pwm_config() David Wu 2017-07-03 18:31 ` Boris Brezillon 2017-07-03 18:31 ` Boris Brezillon 2017-06-29 12:27 ` [PATCH 3/5] pwm: rockchip: Move the configuration of polarity from rockchip_pwm_set_enable() to rockchip_pwm_config() David Wu 2017-06-29 12:27 ` David Wu 2017-06-29 12:27 ` David Wu 2017-07-03 18:36 ` Boris Brezillon 2017-07-03 18:36 ` Boris Brezillon 2017-07-03 18:36 ` Boris Brezillon 2017-07-04 6:46 ` David.Wu 2017-07-04 6:46 ` David.Wu 2017-06-29 12:27 ` [PATCH 4/5] pwm: rockchip: Add atomic updated feature for rk3328 David Wu 2017-06-29 12:27 ` David Wu 2017-07-03 18:39 ` Boris Brezillon 2017-07-03 18:39 ` Boris Brezillon 2017-07-04 7:37 ` David.Wu 2017-07-04 7:37 ` David.Wu 2017-07-06 17:17 ` Rob Herring 2017-07-06 17:17 ` Rob Herring 2017-06-29 12:34 ` [PATCH 5/5] Arm64: dts: rockchip: Add pwm nodes " David Wu 2017-06-29 12:34 ` David Wu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1498739271-27431-3-git-send-email-david.wu@rock-chips.com \ --to=david.wu@rock-chips.com \ --cc=boris.brezillon@free-electrons.com \ --cc=briannorris@chromium.org \ --cc=catalin.marinas@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=dianders@chromium.org \ --cc=heiko@sntech.de \ --cc=huangtao@rock-chips.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mark.rutland@arm.com \ --cc=robh+dt@kernel.org \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.