diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-28 12:39:40 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2025-02-28 12:39:40 +0100 |
| commit | a8e9ef4c8fd586b65e97532e8143e63090d772b5 (patch) | |
| tree | aa6f216bb81c721c05180c9688b1817ca79c9e72 /include/linux | |
| parent | c432bdcf39d52cbba7487d4ebfcf735cee59481e (diff) | |
| parent | 0dffacbbf8d044456d50c893adb9499775c489f4 (diff) | |
pmdomain: Merge tag regulator-devm-of-get into next
Merge the tag regulator-devm-of-get from
git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next.
This introduces devm_of_regulator_get without the _optional suffix, since
that is more sensible for the Rockchip usecase.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/regulator/consumer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h index ffe912f345ae..56fe2693d9b2 100644 --- a/include/linux/regulator/consumer.h +++ b/include/linux/regulator/consumer.h @@ -677,6 +677,12 @@ regulator_is_equal(struct regulator *reg1, struct regulator *reg2) #endif #if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_REGULATOR) +struct regulator *__must_check of_regulator_get(struct device *dev, + struct device_node *node, + const char *id); +struct regulator *__must_check devm_of_regulator_get(struct device *dev, + struct device_node *node, + const char *id); struct regulator *__must_check of_regulator_get_optional(struct device *dev, struct device_node *node, const char *id); |