Commit c7078972 authored by Max Kellermann's avatar Max Kellermann Committed by Thierry Reding
Browse files

pwm-sun4i: Convert "next_period" to local variable 



Its value is calculated in sun4i_pwm_apply() and is used only there.

Signed-off-by: default avatarMax Kellermann <max.kellermann@gmail.com>
Reviewed-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent b2d229d4

drivers/pwm/pwm-sun4i.c

+4 −5
Original line number Diff line number Diff line
@@ -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