Commit 77965c98 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thierry Reding
Browse files

pwm: Move legacy driver handling into a dedicated function 



There is no change in behaviour, only some code is moved from
pwm_apply_state to a separate function.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent fa55b7dc

drivers/pwm/core.c

+70 −60
Original line number Diff line number Diff line
@@ -522,6 +522,64 @@ static void pwm_apply_state_debug(struct pwm_device *pwm, 
	}

}



static int pwm_apply_legacy(struct pwm_chip *chip, struct pwm_device *pwm,

			    const struct pwm_state *state)

{

	int err;



	/*

	 * FIXME: restore the initial state in case of error.

	 */

	if (state->polarity != pwm->state.polarity) {

		if (!chip->ops->set_polarity)

			return -EINVAL;



		/*

		 * Changing the polarity of a running PWM is only allowed when

		 * the PWM driver implements ->apply().

		 */

		if (pwm->state.enabled) {

			chip->ops->disable(chip, pwm);



			/*

			 * Update pwm->state already here in case

			 * .set_polarity() or another callback depend on that.

			 */

			pwm->state.enabled = false;

		}



		err = chip->ops->set_polarity(chip, pwm, state->polarity);

		if (err)

			return err;



		pwm->state.polarity = state->polarity;

	}



	if (state->period != pwm->state.period ||

	    state->duty_cycle != pwm->state.duty_cycle) {

		err = chip->ops->config(pwm->chip, pwm,

					state->duty_cycle,

					state->period);

		if (err)

			return err;



		pwm->state.period = state->period;

		pwm->state.duty_cycle = state->duty_cycle;

	}



	if (state->enabled != pwm->state.enabled) {

		if (!pwm->state.enabled) {

			err = chip->ops->enable(chip, pwm);

			if (err)

				return err;

		} else {

			chip->ops->disable(chip, pwm);

		}

	}



	return 0;

}



/**

 * pwm_apply_state() - atomically apply a new state to a PWM device

 * @pwm: PWM device
@@ -554,8 +612,10 @@ int pwm_apply_state(struct pwm_device *pwm, const struct pwm_state *state) 
	    state->usage_power == pwm->state.usage_power)

		return 0;



	if (chip->ops->apply) {

	if (chip->ops->apply)

		err = chip->ops->apply(chip, pwm, state);

	else

		err = pwm_apply_legacy(chip, pwm, state);

	if (err)

		return err;
@@ -568,56 +628,6 @@ int pwm_apply_state(struct pwm_device *pwm, const struct pwm_state *state) 
	 * implementations of .get_state depend on this

	 */

	pwm_apply_state_debug(pwm, state);

	} else {

		/*

		 * FIXME: restore the initial state in case of error.

		 */

		if (state->polarity != pwm->state.polarity) {

			if (!chip->ops->set_polarity)

				return -EINVAL;



			/*

			 * Changing the polarity of a running PWM is

			 * only allowed when the PWM driver implements

			 * ->apply().

			 */

			if (pwm->state.enabled) {

				chip->ops->disable(chip, pwm);

				pwm->state.enabled = false;

			}



			err = chip->ops->set_polarity(chip, pwm,

						      state->polarity);

			if (err)

				return err;



			pwm->state.polarity = state->polarity;

		}



		if (state->period != pwm->state.period ||

		    state->duty_cycle != pwm->state.duty_cycle) {

			err = chip->ops->config(pwm->chip, pwm,

						state->duty_cycle,

						state->period);

			if (err)

				return err;



			pwm->state.duty_cycle = state->duty_cycle;

			pwm->state.period = state->period;

		}



		if (state->enabled != pwm->state.enabled) {

			if (state->enabled) {

				err = chip->ops->enable(chip, pwm);

				if (err)

					return err;

			} else {

				chip->ops->disable(chip, pwm);

			}



			pwm->state.enabled = state->enabled;

		}

	}



	return 0;

}