Merge tag 'pwm/for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[linux-block.git] / drivers / pwm / core.c

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index ebb2c53ac7a74666d58aa84d28dceb6605e93c1a..d333e7422f4a9c9e9619d603934c8f5ba0a4c030 100644 (file)
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -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 @@ put:
 
        return pwm;
 }
-EXPORT_SYMBOL_GPL(of_pwm_get);
 
 /**
  * acpi_pwm_get() - request a PWM via parsing "pwms" property in ACPI
@@ -1070,36 +1069,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