From: Max Kellermann <max.kellermann@gmail.com>
To: linux-pwm@vger.kernel.org, thierry.reding@gmail.com,
u.kleine-koenig@pengutronix.de, lee.jones@linaro.org
Cc: linux-kernel@vger.kernel.org, andrey@lebedev.lt,
Max Kellermann <max.kellermann@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH 1/3] pwm-sun4i: convert "next_period" to local variable
Date: Tue, 25 Jan 2022 13:34:27 +0100 [thread overview]
Message-ID: <20220125123429.3490883-1-max.kellermann@gmail.com> (raw)
Its value is calculated in sun4i_pwm_apply() and is used only there.
Cc: stable@vger.kernel.org
Signed-off-by: Max Kellermann <max.kellermann@gmail.com>
---
drivers/pwm/pwm-sun4i.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c
index 91ca67651abd..c7c564a6bf36 100644
--- a/drivers/pwm/pwm-sun4i.c
+++ b/drivers/pwm/pwm-sun4i.c
@@ -89,7 +89,6 @@ struct sun4i_pwm_chip {
void __iomem *base;
spinlock_t ctrl_lock;
const struct sun4i_pwm_data *data;
- unsigned long next_period[2];
};
static inline struct sun4i_pwm_chip *to_sun4i_pwm_chip(struct pwm_chip *chip)
@@ -237,6 +236,7 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
int ret;
unsigned int delay_us, prescaler = 0;
unsigned long now;
+ unsigned long next_period;
bool bypass;
pwm_get_state(pwm, &cstate);
@@ -284,7 +284,7 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
val = (duty & PWM_DTY_MASK) | PWM_PRD(period);
sun4i_pwm_writel(sun4i_pwm, val, PWM_CH_PRD(pwm->hwpwm));
- sun4i_pwm->next_period[pwm->hwpwm] = jiffies +
+ next_period = jiffies +
nsecs_to_jiffies(cstate.period + 1000);
if (state->polarity != PWM_POLARITY_NORMAL)
@@ -306,9 +306,8 @@ static int sun4i_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
/* We need a full period to elapse before disabling the channel. */
now = jiffies;
- if (time_before(now, sun4i_pwm->next_period[pwm->hwpwm])) {
- delay_us = jiffies_to_usecs(sun4i_pwm->next_period[pwm->hwpwm] -
- now);
+ if (time_before(now, next_period)) {
+ delay_us = jiffies_to_usecs(next_period - now);
if ((delay_us / 500) > MAX_UDELAY_MS)
msleep(delay_us / 1000 + 1);
else
--
2.34.0
next reply other threads:[~2022-01-25 12:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 12:34 Max Kellermann [this message]
2022-01-25 12:34 ` [PATCH 2/3] pwm-sun4i: calculate "delay_jiffies" directly, eliminate absolute time Max Kellermann
2022-02-24 16:50 ` Uwe Kleine-König
2022-01-25 12:34 ` [PATCH 3/3] pwm-sun4i: calculate the delay without rounding down to jiffies Max Kellermann
2022-02-24 16:51 ` Uwe Kleine-König
2022-03-03 21:56 ` Uwe Kleine-König
2022-01-25 14:31 ` [PATCH 1/3] pwm-sun4i: convert "next_period" to local variable Uwe Kleine-König
2022-01-25 14:39 ` Max Kellermann
2022-01-25 14:43 ` Uwe Kleine-König
2022-02-24 13:04 ` Thierry Reding
2022-02-24 16:49 ` Uwe Kleine-König
2022-04-22 15:47 ` Thierry Reding
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=20220125123429.3490883-1-max.kellermann@gmail.com \
--to=max.kellermann@gmail.com \
--cc=andrey@lebedev.lt \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/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.