From: Ahmad Fatoum <ahmad@a3f.at>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 02/12] PWM: core: remove FLAG_ENABLED
Date: Mon, 30 Mar 2020 16:57:07 +0200 [thread overview]
Message-ID: <20200330145717.667403-3-ahmad@a3f.at> (raw)
In-Reply-To: <20200330145717.667403-1-ahmad@a3f.at>
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
In preparation for moving to a struct pwm_state like Linux does, turn
the flag into a variable.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
drivers/pwm/core.c | 12 ++++++++----
include/pwm.h | 2 ++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index c8016999f0d2..cae23c98ee2d 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -24,7 +24,6 @@ struct pwm_device {
struct pwm_chip *chip;
unsigned long flags;
#define FLAG_REQUESTED 0
-#define FLAG_ENABLED 1
struct list_head node;
struct device_d *hwdev;
struct device_d dev;
@@ -283,8 +282,10 @@ int pwm_enable(struct pwm_device *pwm)
{
pwm->p_enable = 1;
- if (!test_and_set_bit(FLAG_ENABLED, &pwm->flags))
+ if (!pwm->chip->p_enable) {
+ pwm->chip->p_enable = 1;
return pwm->chip->ops->enable(pwm->chip);
+ }
return 0;
}
@@ -297,7 +298,10 @@ void pwm_disable(struct pwm_device *pwm)
{
pwm->p_enable = 0;
- if (test_and_clear_bit(FLAG_ENABLED, &pwm->flags))
- pwm->chip->ops->disable(pwm->chip);
+ if (!pwm->chip->p_enable)
+ return;
+
+ pwm->chip->p_enable = 0;
+ pwm->chip->ops->disable(pwm->chip);
}
EXPORT_SYMBOL_GPL(pwm_disable);
diff --git a/include/pwm.h b/include/pwm.h
index ca01f5b53d1c..98af1299748a 100644
--- a/include/pwm.h
+++ b/include/pwm.h
@@ -63,6 +63,7 @@ struct pwm_ops {
* @ops: The callbacks for this PWM
* @duty_ns: The duty cycle of the PWM, in nano-seconds
* @period_ns: The period of the PWM, in nano-seconds
+ * @p_enable: whether the PWM is enabled
*/
struct pwm_chip {
int id;
@@ -70,6 +71,7 @@ struct pwm_chip {
const struct pwm_ops *ops;
int duty_ns;
int period_ns;
+ int p_enable;
};
int pwmchip_add(struct pwm_chip *chip, struct device_d *dev);
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-03-30 14:57 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-30 14:57 [PATCH 00/12] PWM: add support for ->apply, polarity and STM32 Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 01/12] led: pwm: always initialize PWM LEDs as inactive Ahmad Fatoum
2020-03-30 14:57 ` Ahmad Fatoum [this message]
2020-03-30 14:57 ` [PATCH 03/12] PWM: core: remove ineffectual pwm_{set,get}_duty_cycle Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 04/12] PWM: core: group PWM state into new struct pwm_state Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 05/12] PWM: core: remove old PWM API in favor of Linux ->apply Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 06/12] PWM: core: retire pwm_set_period Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 07/12] PWM: core: apply initial state in of_pwm_request Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 08/12] video: backlight-pwm: use new pwm_apply_state API Ahmad Fatoum
2020-03-31 6:10 ` Sascha Hauer
2020-03-31 6:54 ` Ahmad Fatoum
2020-03-31 7:49 ` Sascha Hauer
2020-03-30 14:57 ` [PATCH 09/12] led: pwm: " Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 10/12] PWM: core: add apply API support for polarity Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 11/12] of: introduce of_property_count_elems_of_size Ahmad Fatoum
2020-03-30 14:57 ` [PATCH 12/12] PWM: add support for STM32 Ahmad Fatoum
2020-03-31 6:41 ` Sascha Hauer
2020-03-31 6:49 ` Ahmad Fatoum
2020-03-31 7:49 ` Sascha Hauer
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=20200330145717.667403-3-ahmad@a3f.at \
--to=ahmad@a3f.at \
--cc=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox