All of lore.kernel.org
 help / color / mirror / Atom feed
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 v2 2/7] pwm: rockchip: Remove the judge from return value of pwm_config
Date: Sat,  8 Jul 2017 12:03:44 +0800	[thread overview]
Message-ID: <1499486629-9659-3-git-send-email-david.wu@rock-chips.com> (raw)
In-Reply-To: <1499486629-9659-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>
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,
-- 
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 v2 2/7] pwm: rockchip: Remove the judge from return value of pwm_config
Date: Sat,  8 Jul 2017 12:03:44 +0800	[thread overview]
Message-ID: <1499486629-9659-3-git-send-email-david.wu@rock-chips.com> (raw)
In-Reply-To: <1499486629-9659-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>
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,
-- 
1.9.1

  parent reply	other threads:[~2017-07-08  4:00 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-08  4:03 [PATCH v2 0/7] Add rk3328 pwm support David Wu
2017-07-08  4:03 ` David Wu
2017-07-08  4:03 ` David Wu
2017-07-08  4:03 ` [PATCH v2 1/7] pwm: rockchip: Add APB and function both clocks support David Wu
2017-07-08  4:03   ` David Wu
2017-07-11 17:03   ` Doug Anderson
2017-07-11 17:03     ` Doug Anderson
2017-07-12  8:38     ` David.Wu
2017-07-12  8:38       ` David.Wu
2017-07-12  8:38       ` David.Wu
2017-07-12 19:09       ` Heiko Stübner
2017-07-12 19:09         ` Heiko Stübner
2017-07-12 19:09         ` Heiko Stübner
2017-07-08  4:03 ` David Wu [this message]
2017-07-08  4:03   ` [PATCH v2 2/7] pwm: rockchip: Remove the judge from return value of pwm_config David Wu
2017-07-08  4:03 ` [PATCH v2 3/7] pwm: rockchip: Remove the dumplicate rockchip_pwm_ops ops David Wu
2017-07-08  4:03   ` David Wu
2017-07-08  4:03   ` David Wu
2017-08-02  8:59   ` Boris Brezillon
2017-08-02  8:59     ` Boris Brezillon
2017-08-02 11:31     ` David.Wu
2017-08-02 11:31       ` David.Wu
2017-08-02 11:31       ` David.Wu
2017-08-02 11:40       ` Boris Brezillon
2017-08-02 11:40         ` Boris Brezillon
2017-08-02 11:40         ` Boris Brezillon
2017-08-04  2:38         ` David.Wu
2017-08-04  2:38           ` David.Wu
2017-08-04  2:38           ` David.Wu
2017-08-04  7:09           ` Boris Brezillon
2017-08-04  7:09             ` Boris Brezillon
2017-08-04  7:09             ` Boris Brezillon
2017-08-08 15:41             ` David.Wu
2017-08-08 15:41               ` David.Wu
2017-07-08  4:03 ` [PATCH v2 4/7] pwm: rockchip: Use pwm_apply instead of the pwm_enable David Wu
2017-07-08  4:03   ` David Wu
2017-07-08  4:08 ` [PATCH v2 5/7] pwm: rockchip: Move the configuration of polarity from rockchip_pwm_set_enable() to rockchip_pwm_config() David Wu
2017-07-08  4:08   ` David Wu
2017-07-08  4:08   ` David Wu
2017-07-08  4:09 ` [PATCH v2 6/7] pwm: rockchip: Add rk3328 pwm support David Wu
2017-07-08  4:09   ` David Wu
2017-07-08  4:10 ` [PATCH v2 7/7] arm64: dts: rockchip: Add pwm nodes for rk3328 David Wu
2017-07-08  4:10   ` David Wu
2017-07-08  4:25 ` [RESEND PATCH v2 6/7] pwm: rockchip: Add rk3328 pwm support David Wu
2017-07-08  4:25   ` David Wu
2017-07-08  4:25   ` David Wu
2017-08-02  8:46 ` [PATCH v2 0/7] " David.Wu
2017-08-02  8:46   ` David.Wu
2017-08-02  8:46   ` 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=1499486629-9659-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: link
Be 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.