regulator: Split up _regulator_get()

_regulator_get() contains a lot of common code doing checks prior to the
regulator lookup and housekeeping work after the lookup. Almost all the
code could be shared with a OF-specific variant of _regulator_get().

Split out the common parts so that they can be reused. The OF-specific
version of _regulator_get() will be added in a subsequent patch.
No functional changes were made.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20240911072751.365361-4-wenst@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 40dbff4017f5ff7f506f481207cecb6624643777..1179766811f58365c32577ad4f6474fb3ac6362f 100644 (file)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2106,26 +2106,43 @@ out:
        return ret;
 }
 
-/* Internal regulator request function */
-struct regulator *_regulator_get(struct device *dev, const char *id,
-                                enum regulator_get_type get_type)
+/* common pre-checks for regulator requests */
+int _regulator_get_common_check(struct device *dev, const char *id,
+                               enum regulator_get_type get_type)
 {
-       struct regulator_dev *rdev;
-       struct regulator *regulator;
-       struct device_link *link;
-       int ret;
-
        if (get_type >= MAX_GET_TYPE) {
                dev_err(dev, "invalid type %d in %s\n", get_type, __func__);
-               return ERR_PTR(-EINVAL);
+               return -EINVAL;
        }
 
        if (id == NULL) {
                dev_err(dev, "regulator request with no identifier\n");
-               return ERR_PTR(-EINVAL);
+               return -EINVAL;
        }
 
-       rdev = regulator_dev_lookup(dev, id);
+       return 0;
+}
+
+/**
+ * _regulator_get_common - Common code for regulator requests
+ * @rdev: regulator device pointer as returned by *regulator_dev_lookup()
+ *       Its reference count is expected to have been incremented.
+ * @dev: device used for dev_printk messages
+ * @id: Supply name or regulator ID
+ * @get_type: enum regulator_get_type value corresponding to type of request
+ *
+ * Returns: pointer to struct regulator corresponding to @rdev, or ERR_PTR()
+ *         encoded error.
+ *
+ * This function should be chained with *regulator_dev_lookup() functions.
+ */
+struct regulator *_regulator_get_common(struct regulator_dev *rdev, struct device *dev,
+                                       const char *id, enum regulator_get_type get_type)
+{
+       struct regulator *regulator;
+       struct device_link *link;
+       int ret;
+
        if (IS_ERR(rdev)) {
                ret = PTR_ERR(rdev);
 
@@ -2241,6 +2258,21 @@ struct regulator *_regulator_get(struct device *dev, const char *id,
        return regulator;
 }
 
+/* Internal regulator request function */
+struct regulator *_regulator_get(struct device *dev, const char *id,
+                                enum regulator_get_type get_type)
+{
+       struct regulator_dev *rdev;
+       int ret;
+
+       ret = _regulator_get_common_check(dev, id, get_type);
+       if (ret)
+               return ERR_PTR(ret);
+
+       rdev = regulator_dev_lookup(dev, id);
+       return _regulator_get_common(rdev, dev, id, get_type);
+}
+
 /**
  * regulator_get - lookup and obtain a reference to a regulator.
  * @dev: device for regulator "consumer"

diff --git a/drivers/regulator/internal.h b/drivers/regulator/internal.h
index 8e5506c5ee9484ab49a2597bc859a0890f525137..5b43f802468ddbfae36660fc7dc545c28afd20c2 100644 (file)
--- a/drivers/regulator/internal.h
+++ b/drivers/regulator/internal.h
@@ -121,6 +121,10 @@ enum regulator_get_type {
        MAX_GET_TYPE
 };
 
+int _regulator_get_common_check(struct device *dev, const char *id,
+                               enum regulator_get_type get_type);
+struct regulator *_regulator_get_common(struct regulator_dev *rdev, struct device *dev,
+                                       const char *id, enum regulator_get_type get_type);
 struct regulator *_regulator_get(struct device *dev, const char *id,
                                 enum regulator_get_type get_type);
 int _regulator_bulk_get(struct device *dev, int num_consumers,