diff mbox series

[v2,6/7] pwm: core: Remove unused devm_pwm_put()

Message ID 20210531194947.10770-6-andriy.shevchenko@linux.intel.com (mailing list archive)
State Superseded, archived
Headers show
Series [v2,1/7] docs: firmware-guide: ACPI: Add a PWM example | expand

Commit Message

Andy Shevchenko May 31, 2021, 7:49 p.m. UTC
There are no users and seems no will come of the devm_pwm_put().
Remove the function.

While at it, slightly update documentation.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: new patch
 .../driver-api/driver-model/devres.rst        |  3 ++-
 Documentation/driver-api/pwm.rst              |  3 ++-
 drivers/pwm/core.c                            | 25 -------------------
 include/linux/pwm.h                           |  5 ----
 4 files changed, 4 insertions(+), 32 deletions(-)

Comments

Uwe Kleine-König June 6, 2021, 9:40 p.m. UTC | #1
Hello,

On Mon, May 31, 2021 at 10:49:46PM +0300, Andy Shevchenko wrote:
> There are no users and seems no will come of the devm_pwm_put().
> Remove the function.
> 
> While at it, slightly update documentation.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> v2: new patch
>  .../driver-api/driver-model/devres.rst        |  3 ++-
>  Documentation/driver-api/pwm.rst              |  3 ++-
>  drivers/pwm/core.c                            | 25 -------------------
>  include/linux/pwm.h                           |  5 ----
>  4 files changed, 4 insertions(+), 32 deletions(-)
> 
> diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst
> index b2645870ef7e..cc1e0138ba9f 100644
> --- a/Documentation/driver-api/driver-model/devres.rst
> +++ b/Documentation/driver-api/driver-model/devres.rst
> @@ -410,7 +410,8 @@ POWER
>  
>  PWM
>    devm_pwm_get()
> -  devm_pwm_put()
> +  devm_of_pwm_get()
> +  devm_fwnode_pwm_get()
>  
>  REGULATOR
>    devm_regulator_bulk_get()
> diff --git a/Documentation/driver-api/pwm.rst b/Documentation/driver-api/pwm.rst
> index a7ca4f58305a..251e3f7be230 100644
> --- a/Documentation/driver-api/pwm.rst
> +++ b/Documentation/driver-api/pwm.rst
> @@ -40,7 +40,8 @@ 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 these functions, devm_pwm_get() and devm_pwm_put(), also exist.
> +variants of the getter, devm_pwm_get(), devm_of_pwm_get(),
> +devm_fwnode_pwm_get(), also exist.
>  
>  After being requested, a PWM has to be configured using::
>  
> diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
> index a27d7c2aa6fe..6d4410bd9793 100644
> --- a/drivers/pwm/core.c
> +++ b/drivers/pwm/core.c
> @@ -1166,31 +1166,6 @@ struct pwm_device *devm_fwnode_pwm_get(struct device *dev,
>  }
>  EXPORT_SYMBOL_GPL(devm_fwnode_pwm_get);
>  
> -static int devm_pwm_match(struct device *dev, void *res, void *data)
> -{
> -	struct pwm_device **p = res;
> -
> -	if (WARN_ON(!p || !*p))
> -		return 0;
> -
> -	return *p == data;
> -}
> -
> -/**
> - * devm_pwm_put() - resource managed pwm_put()
> - * @dev: device for PWM consumer
> - * @pwm: PWM device
> - *
> - * Release a PWM previously allocated using devm_pwm_get(). Calling this
> - * function is usually not needed because devm-allocated resources are
> - * automatically released on driver detach.
> - */
> -void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
> -{
> -	WARN_ON(devres_release(dev, devm_pwm_release, devm_pwm_match, pwm));
> -}
> -EXPORT_SYMBOL_GPL(devm_pwm_put);
> -
>  #ifdef CONFIG_DEBUG_FS
>  static void pwm_dbg_show(struct pwm_chip *chip, struct seq_file *s)
>  {
> diff --git a/include/linux/pwm.h b/include/linux/pwm.h
> index 5bb90af4997e..1eaded57c666 100644
> --- a/include/linux/pwm.h
> +++ b/include/linux/pwm.h
> @@ -417,7 +417,6 @@ struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np,
>  struct pwm_device *devm_fwnode_pwm_get(struct device *dev,
>  				       struct fwnode_handle *fwnode,
>  				       const char *con_id);
> -void devm_pwm_put(struct device *dev, struct pwm_device *pwm);
>  #else
>  static inline struct pwm_device *pwm_request(int pwm_id, const char *label)
>  {
> @@ -524,10 +523,6 @@ devm_fwnode_pwm_get(struct device *dev, struct fwnode_handle *fwnode,
>  {
>  	return ERR_PTR(-ENODEV);
>  }
> -
> -static inline void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
> -{
> -}
>  #endif
>  
>  static inline void pwm_apply_args(struct pwm_device *pwm)

Nice.

Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Best regards
Uwe
diff mbox series

Patch

diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst
index b2645870ef7e..cc1e0138ba9f 100644
--- a/Documentation/driver-api/driver-model/devres.rst
+++ b/Documentation/driver-api/driver-model/devres.rst
@@ -410,7 +410,8 @@  POWER
 
 PWM
   devm_pwm_get()
-  devm_pwm_put()
+  devm_of_pwm_get()
+  devm_fwnode_pwm_get()
 
 REGULATOR
   devm_regulator_bulk_get()
diff --git a/Documentation/driver-api/pwm.rst b/Documentation/driver-api/pwm.rst
index a7ca4f58305a..251e3f7be230 100644
--- a/Documentation/driver-api/pwm.rst
+++ b/Documentation/driver-api/pwm.rst
@@ -40,7 +40,8 @@  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 these functions, devm_pwm_get() and devm_pwm_put(), also exist.
+variants of the getter, devm_pwm_get(), devm_of_pwm_get(),
+devm_fwnode_pwm_get(), also exist.
 
 After being requested, a PWM has to be configured using::
 
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index a27d7c2aa6fe..6d4410bd9793 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -1166,31 +1166,6 @@  struct pwm_device *devm_fwnode_pwm_get(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(devm_fwnode_pwm_get);
 
-static int devm_pwm_match(struct device *dev, void *res, void *data)
-{
-	struct pwm_device **p = res;
-
-	if (WARN_ON(!p || !*p))
-		return 0;
-
-	return *p == data;
-}
-
-/**
- * devm_pwm_put() - resource managed pwm_put()
- * @dev: device for PWM consumer
- * @pwm: PWM device
- *
- * Release a PWM previously allocated using devm_pwm_get(). Calling this
- * function is usually not needed because devm-allocated resources are
- * automatically released on driver detach.
- */
-void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
-{
-	WARN_ON(devres_release(dev, devm_pwm_release, devm_pwm_match, pwm));
-}
-EXPORT_SYMBOL_GPL(devm_pwm_put);
-
 #ifdef CONFIG_DEBUG_FS
 static void pwm_dbg_show(struct pwm_chip *chip, struct seq_file *s)
 {
diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index 5bb90af4997e..1eaded57c666 100644
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -417,7 +417,6 @@  struct pwm_device *devm_of_pwm_get(struct device *dev, struct device_node *np,
 struct pwm_device *devm_fwnode_pwm_get(struct device *dev,
 				       struct fwnode_handle *fwnode,
 				       const char *con_id);
-void devm_pwm_put(struct device *dev, struct pwm_device *pwm);
 #else
 static inline struct pwm_device *pwm_request(int pwm_id, const char *label)
 {
@@ -524,10 +523,6 @@  devm_fwnode_pwm_get(struct device *dev, struct fwnode_handle *fwnode,
 {
 	return ERR_PTR(-ENODEV);
 }
-
-static inline void devm_pwm_put(struct device *dev, struct pwm_device *pwm)
-{
-}
 #endif
 
 static inline void pwm_apply_args(struct pwm_device *pwm)