diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-12-21 04:43:59 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2013-02-01 20:47:05 -0500 |
commit | 261a5edd3ac77ecb4b33310a1dd1ed8d656f0569 (patch) | |
tree | 61e966d8cdd8c116f128cbe3843841661f0f254c | |
parent | 8eb9612799605a7988d1c97cdc5980a5b8f04c56 (diff) |
pwm: Add devm_of_pwm_get() as exported API for users
When booted with DT users can use devm version of of_pwm_get() to benefit
from automatic resource release.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
-rw-r--r-- | drivers/pwm/core.c | 30 | ||||
-rw-r--r-- | include/linux/pwm.h | 9 |
2 files changed, 39 insertions, 0 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 3cb741dc2038..4a13da48fefe 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c | |||
@@ -708,6 +708,36 @@ struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id) | |||
708 | } | 708 | } |
709 | EXPORT_SYMBOL_GPL(devm_pwm_get); | 709 | EXPORT_SYMBOL_GPL(devm_pwm_get); |
710 | 710 | ||
711 | /** | ||
712 | * devm_of_pwm_get() - resource managed of_pwm_get() | ||
713 | * @dev: device for PWM consumer | ||
714 | * @np: device node to get the PWM from | ||
715 | * @con_id: consumer name | ||
716 | * | ||
717 | * This function performs like of_pwm_get() but the acquired PWM device will | ||
718 | * automatically be released on driver detach. | ||
719 | */ | ||
720 | struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np, | ||
721 | const char *con_id) | ||
722 | { | ||
723 | struct pwm_device **ptr, *pwm; | ||
724 | |||
725 | ptr = devres_alloc(devm_pwm_release, sizeof(**ptr), GFP_KERNEL); | ||
726 | if (!ptr) | ||
727 | return ERR_PTR(-ENOMEM); | ||
728 | |||
729 | pwm = of_pwm_get(np, con_id); | ||
730 | if (!IS_ERR(pwm)) { | ||
731 | *ptr = pwm; | ||
732 | devres_add(dev, ptr); | ||
733 | } else { | ||
734 | devres_free(ptr); | ||
735 | } | ||
736 | |||
737 | return pwm; | ||
738 | } | ||
739 | EXPORT_SYMBOL_GPL(devm_of_pwm_get); | ||
740 | |||
711 | static int devm_pwm_match(struct device *dev, void *res, void *data) | 741 | static int devm_pwm_match(struct device *dev, void *res, void *data) |
712 | { | 742 | { |
713 | struct pwm_device **p = res; | 743 | struct pwm_device **p = res; |
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index 76a1959f2b23..70655a205b74 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h | |||
@@ -179,6 +179,8 @@ struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id); | |||
179 | void pwm_put(struct pwm_device *pwm); | 179 | void pwm_put(struct pwm_device *pwm); |
180 | 180 | ||
181 | struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id); | 181 | struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id); |
182 | struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np, | ||
183 | const char *con_id); | ||
182 | void devm_pwm_put(struct device *dev, struct pwm_device *pwm); | 184 | void devm_pwm_put(struct device *dev, struct pwm_device *pwm); |
183 | #else | 185 | #else |
184 | static inline int pwm_set_chip_data(struct pwm_device *pwm, void *data) | 186 | static inline int pwm_set_chip_data(struct pwm_device *pwm, void *data) |
@@ -230,6 +232,13 @@ static inline struct pwm_device *devm_pwm_get(struct device *dev, | |||
230 | return ERR_PTR(-ENODEV); | 232 | return ERR_PTR(-ENODEV); |
231 | } | 233 | } |
232 | 234 | ||
235 | static inline struct pwm_device *devm_of_pwm_get(struct device *dev, | ||
236 | struct device_node *np, | ||
237 | const char *con_id) | ||
238 | { | ||
239 | return ERR_PTR(-ENODEV); | ||
240 | } | ||
241 | |||
233 | static inline void devm_pwm_put(struct device *dev, struct pwm_device *pwm) | 242 | static inline void devm_pwm_put(struct device *dev, struct pwm_device *pwm) |
234 | { | 243 | { |
235 | } | 244 | } |