| Message ID | 20240822092006.3134096-4-wenst@chromium.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | platform/chrome: Introduce DT hardware prober | expand |
On Thu, Aug 22, 2024 at 05:19:56PM +0800, Chen-Yu Tsai wrote: > _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. > +/** > + * _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 a struct regulator corresponding to @rdev, > + * or IS_ERR() condition containing errno. > + * > + * This function should be chained with *regulator_dev_lookup() functions. kernel-doc will warn here: No "Return" section. > + */
On Thu, Aug 22, 2024 at 9:49 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > > On Thu, Aug 22, 2024 at 05:19:56PM +0800, Chen-Yu Tsai wrote: > > _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. > > > +/** > > + * _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 a struct regulator corresponding to @rdev, > > + * or IS_ERR() condition containing errno. > > + * > > + * This function should be chained with *regulator_dev_lookup() functions. > > kernel-doc will warn here: No "Return" section. Will fix. ChenYu > > + */ > > -- > With Best Regards, > Andy Shevchenko > >
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 361309fcae57..4d1c640cc030 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2093,26 +2093,43 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) 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 a struct regulator corresponding to @rdev, + * or IS_ERR() condition containing errno. + * + * 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); @@ -2228,6 +2245,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 ffeaef22169e..3718459fb0c5 100644 --- 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,
_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> --- Changes since v4: - New patch --- drivers/regulator/core.c | 54 ++++++++++++++++++++++++++++-------- drivers/regulator/internal.h | 4 +++ 2 files changed, 47 insertions(+), 11 deletions(-)