hwmon: (pwm-fan) Replace OF specific call to PWM by plain one
Subsystems (4)
PATCH v2 1/3 hwmon: (pwm-fan) Replace OF specific call to PWM by plain one
There is no need to call OF specific devm_of_pwm_get() since the device node parameter duplicates in the device parameter. Hence we may safely replace it by plain devm_pwm_get() call.
This allows to drop devm_of_pwm_get() as no more users will be.
---
v2: added tag (Uwe), left only one-liner change (Uwe, Guenter)
drivers/hwmon/pwm-fan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hwmon/pwm-fan.c +1 -1
@@ -302,7 +302,7 @@ static int pwm_fan_probe(struct platform_device *pdev)mutex_init (&ctx->lock); - ctx->pwm =devm_of_pwm_get (dev, dev->of_node,NULL ); + ctx->pwm =devm_pwm_get (dev,NULL );if (IS_ERR (ctx->pwm))return dev_err_probe (dev,PTR_ERR (ctx->pwm),"Could not get PWM\n" );
Signature · 1 line
2.35.1
PATCH v2 2/3 pwm: core: Get rid of unused devm_of_pwm_get()
The devm_of_pwm_get() has recently lost its single user, drop the dead API as well.
Note, the new code should use either plain pwm_get() or managed devm_pwm_get() or devm_fwnode_pwm_get() APIs.
---
v2: added tag (Uwe)
.../driver-api/driver-model/devres.rst | 1 - Documentation/driver-api/pwm.rst | 3 +- drivers/pwm/core.c | 30 ------------------- include/linux/pwm.h | 10 ------- 4 files changed, 1 insertion(+), 43 deletions(-)
Documentation/driver-api/driver-model/devres.rst +0 -1
@@ -410,7 +410,6 @@ POWER PWM devm_pwm_get() - devm_of_pwm_get() devm_fwnode_pwm_get() REGULATOR
Documentation/driver-api/pwm.rst +1 -2
@@ -40,8 +40,7 @@ after usage with pwm_free(). New users should use the pwm_get() function and pass to it the consumer device or a consumer name. pwm_put() is used to free the PWM device. Managed -variants of the getter, devm_pwm_get(), devm_of_pwm_get(), -devm_fwnode_pwm_get(), also exist. +variants of the getter, devm_pwm_get() and devm_fwnode_pwm_get(), also exist. After being requested, a PWM has to be configured using::
drivers/pwm/core.c +0 -30
@@ -1070,36 +1070,6 @@ struct pwm_device *devm_pwm_get(struct device *dev, const char *con_id) }EXPORT_SYMBOL_GPL (devm_pwm_get); -/** -* devm_of_pwm_get() - resource managed of_pwm_get() -* @dev: device for PWM consumer -* @np: device node to get the PWM from -* @con_id: consumer name -* -* This function performs like of_pwm_get() but the acquired PWM device will -* automatically be released on driver detach. -* -* Returns: A pointer to the requested PWM device or an ERR_PTR()-encoded -* error code on failure. -*/ -struct pwm_device *devm_of_pwm_get (struct device *dev,struct device_node *np, -const char *con_id) -{ -struct pwm_device *pwm; -int ret; - - pwm =of_pwm_get (dev, np, con_id); -if (IS_ERR (pwm)) -return pwm; - - ret =devm_add_action_or_reset (dev, devm_pwm_release, pwm); -if (ret) -return ERR_PTR (ret); - -return pwm; -} -EXPORT_SYMBOL_GPL (devm_of_pwm_get); -/** * devm_fwnode_pwm_get() - request a resource managed PWM from firmware node * @dev: device for PWM consumer
include/linux/pwm.h +0 -10
@@ -408,8 +408,6 @@ struct pwm_device *of_pwm_get(struct device *dev, struct device_node *np,void pwm_put (struct pwm_device *pwm);struct pwm_device *devm_pwm_get (struct device *dev,const char *con_id); -struct pwm_device *devm_of_pwm_get (struct device *dev,struct device_node *np, -const char *con_id);struct pwm_device *devm_fwnode_pwm_get (struct device *dev,struct fwnode_handle *fwnode,const char *con_id);
@@ -517,14 +515,6 @@ static inline struct pwm_device *devm_pwm_get(struct device *dev,return ERR_PTR (-ENODEV ); } -static inline struct pwm_device *devm_of_pwm_get (struct device *dev, -struct device_node *np, -const char *con_id) -{ -might_sleep (); -return ERR_PTR (-ENODEV ); -} -static inline struct pwm_device *devm_fwnode_pwm_get (struct device *dev,struct fwnode_handle *fwnode,const char *con_id)
Signature · 1 line
2.35.1
PATCH v2 3/3 pwm: core: Make of_pwm_get() static
In reply to Andy ShevchenkoThere are no users outside of PWM core of the of_pwm_get(). Make it static.
---
v2: added tag (Uwe)
drivers/pwm/core.c | 5 ++--- include/linux/pwm.h | 10 ---------- 2 files changed, 2 insertions(+), 13 deletions(-)
drivers/pwm/core.c +2 -3
@@ -734,8 +734,8 @@ static struct device_link *pwm_device_link_add(struct device *dev,* Returns: A pointer to the requested PWM device or an ERR_PTR()-encoded * error code on failure. */ -struct pwm_device *of_pwm_get (struct device *dev,struct device_node *np, -const char *con_id) +static struct pwm_device *of_pwm_get (struct device *dev,struct device_node *np, +const char *con_id) {struct pwm_device *pwm =NULL ;struct of_phandle_args args;
@@ -797,7 +797,6 @@ struct pwm_device *of_pwm_get(struct device *dev, struct device_node *np,return pwm; } -EXPORT_SYMBOL_GPL (of_pwm_get);/** * acpi_pwm_get() - request a PWM via parsing "pwms" property in ACPI
include/linux/pwm.h +0 -10
@@ -403,8 +403,6 @@ struct pwm_device *of_pwm_single_xlate(struct pwm_chip *pc, const struct of_phandle_args *args);struct pwm_device *pwm_get (struct device *dev,const char *con_id); -struct pwm_device *of_pwm_get (struct device *dev,struct device_node *np, -const char *con_id);void pwm_put (struct pwm_device *pwm);struct pwm_device *devm_pwm_get (struct device *dev,const char *con_id);
@@ -495,14 +493,6 @@ static inline struct pwm_device *pwm_get(struct device *dev,return ERR_PTR (-ENODEV ); } -static inline struct pwm_device *of_pwm_get (struct device *dev, -struct device_node *np, -const char *con_id) -{ -might_sleep (); -return ERR_PTR (-ENODEV ); -} -static inline void pwm_put (struct pwm_device *pwm) {might_sleep ();
Signature · 1 line
2.35.1
Guenter Roeck
maintainerQuoted 8 lines · Andy Shevchenko
There is no need to call OF specific
devm_of_pwm_get()since the device node parameter duplicates in the device parameter. Hence we may safely replace it by plaindevm_pwm_get()call.This allows to drop
devm_of_pwm_get()as no more users will be.Signed-off-by Andy Shevchenko <[email protected]>Acked-by Uwe Kleine-König <[email protected]>
I am going to apply the series to hwmon-next.
Uwe, please holler if that is not ok.
Thanks,
Guenter
Quoted 18 lines
---
v2: added tag (Uwe), left only one-liner change (Uwe, Guenter)drivers/hwmon/pwm-fan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/hwmon/pwm-fan.c +1
-1@@ -302,7 +302,7 @@ static int pwm_fan_probe(struct platform_device *pdev)mutex_init (&ctx->lock); - ctx->pwm =devm_of_pwm_get (dev, dev->of_node,NULL ); + ctx->pwm =devm_pwm_get (dev,NULL );if (IS_ERR (ctx->pwm))return dev_err_probe (dev,PTR_ERR (ctx->pwm),"Could not get PWM\n" );