All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
To: thierry.reding@gmail.com
Cc: linux-pwm@vger.kernel.org, linux-renesas-soc@vger.kernel.org,
	Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Subject: [PATCH 4/5] pwm: rcar: remove legacy APIs
Date: Fri,  7 Dec 2018 17:29:32 +0900	[thread overview]
Message-ID: <1544171373-29618-5-git-send-email-yoshihiro.shimoda.uh@renesas.com> (raw)
In-Reply-To: <1544171373-29618-1-git-send-email-yoshihiro.shimoda.uh@renesas.com>

This patch removes legacy APIs. Since rcar_pwm_{en,dis}able()
functions are reused on "atomic" API, this patch changes
the arguments of these functions. No change in behavior.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 drivers/pwm/pwm-rcar.c | 45 ++++-----------------------------------------
 1 file changed, 4 insertions(+), 41 deletions(-)

diff --git a/drivers/pwm/pwm-rcar.c b/drivers/pwm/pwm-rcar.c
index 1bcb662..e479b6a 100644
--- a/drivers/pwm/pwm-rcar.c
+++ b/drivers/pwm/pwm-rcar.c
@@ -146,40 +146,8 @@ static void rcar_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
 	pm_runtime_put(chip->dev);
 }
 
-static int rcar_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
-			   int duty_ns, int period_ns)
+static int rcar_pwm_enable(struct rcar_pwm_chip *rp)
 {
-	struct rcar_pwm_chip *rp = to_rcar_pwm_chip(chip);
-	int div, ret;
-
-	div = rcar_pwm_get_clock_division(rp, period_ns);
-	if (div < 0)
-		return div;
-
-	/*
-	 * Let the core driver set pwm->period if disabled and duty_ns == 0.
-	 * But, this driver should prevent to set the new duty_ns if current
-	 * duty_cycle is not set
-	 */
-	if (!pwm_is_enabled(pwm) && !duty_ns && !pwm->state.duty_cycle)
-		return 0;
-
-	rcar_pwm_update(rp, RCAR_PWMCR_SYNC, RCAR_PWMCR_SYNC, RCAR_PWMCR);
-
-	rcar_pwm_calc_counter(rp, div, duty_ns, period_ns);
-	ret = rcar_pwm_set_counter(rp);
-	if (!ret)
-		rcar_pwm_set_clock_control(rp, div);
-
-	/* The SYNC should be set to 0 even if rcar_pwm_set_counter failed */
-	rcar_pwm_update(rp, RCAR_PWMCR_SYNC, 0, RCAR_PWMCR);
-
-	return ret;
-}
-
-static int rcar_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
-{
-	struct rcar_pwm_chip *rp = to_rcar_pwm_chip(chip);
 	u32 value;
 
 	/* Don't enable the PWM device if CYC0 or PH0 is 0 */
@@ -193,10 +161,8 @@ static int rcar_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 	return 0;
 }
 
-static void rcar_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
+static void rcar_pwm_disable(struct rcar_pwm_chip *rp)
 {
-	struct rcar_pwm_chip *rp = to_rcar_pwm_chip(chip);
-
 	rcar_pwm_update(rp, RCAR_PWMCR_EN0, 0, RCAR_PWMCR);
 }
 
@@ -221,10 +187,10 @@ static int rcar_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 	rcar_pwm_update(rp, RCAR_PWMCR_SYNC, 0, RCAR_PWMCR);
 
 	if (!ret && state->enabled)
-		ret = rcar_pwm_enable(chip, pwm);
+		ret = rcar_pwm_enable(rp);
 
 	if (!state->enabled) {
-		rcar_pwm_disable(chip, pwm);
+		rcar_pwm_disable(rp);
 		ret = 0;
 	}
 
@@ -234,9 +200,6 @@ static int rcar_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
 static const struct pwm_ops rcar_pwm_ops = {
 	.request = rcar_pwm_request,
 	.free = rcar_pwm_free,
-	.config = rcar_pwm_config,
-	.enable = rcar_pwm_enable,
-	.disable = rcar_pwm_disable,
 	.apply = rcar_pwm_apply,
 	.owner = THIS_MODULE,
 };
-- 
1.9.1

  parent reply	other threads:[~2018-12-07  8:32 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-07  8:29 [PATCH 0/5] pwm: rcar: Add support "atomic" API and workaround Yoshihiro Shimoda
2018-12-07  8:29 ` [PATCH 1/5] pwm: rcar: add rcar_pwm_calc_counter() to calculate PWMCNT value only Yoshihiro Shimoda
2018-12-07  9:00   ` Uwe Kleine-König
2018-12-07  9:00     ` Uwe Kleine-König
2018-12-07  8:29 ` [PATCH 2/5] pwm: rcar: Add support "atomic" API Yoshihiro Shimoda
2018-12-07  9:07   ` Uwe Kleine-König
2018-12-07  9:07     ` Uwe Kleine-König
2018-12-07  9:57     ` Geert Uytterhoeven
2018-12-07 10:45       ` Uwe Kleine-König
2018-12-07 10:45         ` Uwe Kleine-König
2018-12-10  4:58         ` Yoshihiro Shimoda
2018-12-07  8:29 ` [PATCH 3/5] pwm: rcar: Use "atomic" API on rcar_pwm_resume() Yoshihiro Shimoda
2018-12-07  8:29 ` Yoshihiro Shimoda [this message]
2018-12-07  8:29 ` [PATCH 5/5] pwm: rcar: add workaround to output "pseudo" low level Yoshihiro Shimoda
2018-12-07  9:13   ` Uwe Kleine-König
2018-12-07  9:13     ` Uwe Kleine-König
2018-12-10  4:49     ` Yoshihiro Shimoda
2018-12-10  8:11       ` Uwe Kleine-König
2018-12-10  8:11         ` Uwe Kleine-König
2018-12-12  3:19         ` Yoshihiro Shimoda
2018-12-12  3:19           ` Yoshihiro Shimoda
2018-12-12  7:37           ` Uwe Kleine-König
2018-12-12  7:37             ` Uwe Kleine-König
2018-12-12 10:49             ` Yoshihiro Shimoda
2018-12-12 10:49               ` Yoshihiro Shimoda
2018-12-13  9:47     ` Yoshihiro Shimoda
2018-12-13  9:47       ` Yoshihiro Shimoda
2018-12-13  9:52       ` Uwe Kleine-König
2018-12-13  9:52         ` Uwe Kleine-König
2018-12-13 10:53         ` Yoshihiro Shimoda
2018-12-13 10:53           ` Yoshihiro Shimoda
2018-12-07 21:49 ` pwm: rcar: improve calculation of divider Uwe Kleine-König
2018-12-07 21:49   ` Uwe Kleine-König
2018-12-09 20:55   ` Laurent Pinchart
2018-12-10  5:09     ` Yoshihiro Shimoda
2018-12-10  8:04       ` Uwe Kleine-König
2018-12-10  8:04         ` Uwe Kleine-König
2018-12-12  3:13         ` Yoshihiro Shimoda
2018-12-12  3:13           ` Yoshihiro Shimoda
2018-12-09 22:48 ` [PATCH 0/5] pwm: rcar: Add support "atomic" API and workaround Laurent Pinchart

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=1544171373-29618-5-git-send-email-yoshihiro.shimoda.uh@renesas.com \
    --to=yoshihiro.shimoda.uh@renesas.com \
    --cc=linux-pwm@vger.kernel.org \
    --cc=linux-renesas-soc@vger.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.