iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pwm: Move the enabled/disabled info into pwm_state

Browse Source 
Prepare the transition to PWM atomic update by moving the enabled and
disabled state into the pwm_state struct. This way we can easily update
the whole PWM state by copying the new state in the ->state field.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
This commit is contained in:
Boris Brezillon 2016-04-14 21:17:39 +02:00 committed by Thierry Reding
parent 43a276b003
commit 09a7e4a3d9
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/pwm/core.c
View File

@ -499,10 +499,10 @@ int pwm_enable(struct pwm_device *pwm)
if (!pwm) if (!pwm)
return -EINVAL; return -EINVAL;
if (!test_and_set_bit(PWMF_ENABLED, &pwm->flags)) { if (!pwm_is_enabled(pwm)) {
err = pwm->chip->ops->enable(pwm->chip, pwm); err = pwm->chip->ops->enable(pwm->chip, pwm);
if (err) if (!err)
clear_bit(PWMF_ENABLED, &pwm->flags); pwm->state.enabled = true;
} }
return err; return err;
@ -515,8 +515,13 @@ EXPORT_SYMBOL_GPL(pwm_enable);
*/ */
void pwm_disable(struct pwm_device *pwm) void pwm_disable(struct pwm_device *pwm)
{ {
if (pwm && test_and_clear_bit(PWMF_ENABLED, &pwm->flags)) if (!pwm)
return;
if (pwm_is_enabled(pwm)) {
pwm->chip->ops->disable(pwm->chip, pwm); pwm->chip->ops->disable(pwm->chip, pwm);
pwm->state.enabled = false;
}
} }
EXPORT_SYMBOL_GPL(pwm_disable); EXPORT_SYMBOL_GPL(pwm_disable);

11
include/linux/pwm.h
View File

@ -94,8 +94,7 @@ struct pwm_args {
enum { enum {
PWMF_REQUESTED = 1 << 0, PWMF_REQUESTED = 1 << 0,
PWMF_ENABLED = 1 << 1, PWMF_EXPORTED = 1 << 1,
PWMF_EXPORTED = 1 << 2,
}; };
/* /*
@ -103,11 +102,13 @@ enum {
* @period: PWM period (in nanoseconds) * @period: PWM period (in nanoseconds)
* @duty_cycle: PWM duty cycle (in nanoseconds) * @duty_cycle: PWM duty cycle (in nanoseconds)
* @polarity: PWM polarity * @polarity: PWM polarity
* @enabled: PWM enabled status
*/ */
struct pwm_state { struct pwm_state {
unsigned int period; unsigned int period;
unsigned int duty_cycle; unsigned int duty_cycle;
enum pwm_polarity polarity; enum pwm_polarity polarity;
bool enabled;
}; };
/** /**
@ -146,7 +147,11 @@ static inline void pwm_get_state(const struct pwm_device *pwm,
static inline bool pwm_is_enabled(const struct pwm_device *pwm) static inline bool pwm_is_enabled(const struct pwm_device *pwm)
{ {
return test_bit(PWMF_ENABLED, &pwm->flags); struct pwm_state state;
pwm_get_state(pwm, &state);
return state.enabled;
} }
static inline void pwm_set_period(struct pwm_device *pwm, unsigned int period) static inline void pwm_set_period(struct pwm_device *pwm, unsigned int period)