Pull regulator fixes from Mark Brown: "The main thing here is a change to make sure that we don't try to double resolve the supply of a regulator if we have two probes going on simultaneously, plus an incremental fix on top of that to resolve a lockdep issue it introduced. There's also a patch from Dmitry Osipenko adding stubs for some functions to avoid build issues in consumers in some configurations" * tag 'regulator-fix-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: Fix lockdep warning resolving supplies regulator: consumer: Add missing stubs to regulator/consumer.h regulator: core: avoid regulator_resolve_supply() race condition
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -331,6 +331,12 @@ regulator_get_exclusive(struct device *dev, const char *id) · 330 unmodified lines | |||
| 331 | return ERR_PTR(-ENODEV); | 331 | return ERR_PTR(-ENODEV); |
| 332 | } | 332 | } |
| 333 | 333 | ||
| 334 | static inline struct regulator *__must_check | ||
| 335 | devm_regulator_get_exclusive(struct device *dev, const char *id) | ||
| 336 | { | ||
| 337 | return ERR_PTR(-ENODEV); | ||
| 338 | } | ||
| 339 | |||
| 334 | static inline struct regulator *__must_check | 340 | static inline struct regulator *__must_check |
| 335 | regulator_get_optional(struct device *dev, const char *id) | 341 | regulator_get_optional(struct device *dev, const char *id) |
| 336 | { | 342 | { |
| @@ -486,6 +492,11 @@ static inline int regulator_get_voltage(struct regulator *regulator) · 149 unmodified lines | |||
| 486 | return -EINVAL; | 492 | return -EINVAL; |
| 487 | } | 493 | } |
| 488 | 494 | ||
| 495 | static inline int regulator_sync_voltage(struct regulator *regulator) | ||
| 496 | { | ||
| 497 | return -EINVAL; | ||
| 498 | } | ||
| 499 | |||
| 489 | static inline int regulator_is_supported_voltage(struct regulator *regulator, | 500 | static inline int regulator_is_supported_voltage(struct regulator *regulator, |
| 490 | int min_uV, int max_uV) | 501 | int min_uV, int max_uV) |
| 491 | { | 502 | { |
| @@ -578,6 +589,25 @@ static inline int devm_regulator_unregister_notifier(struct regulator *regulator · 86 unmodified lines | |||
| 578 | return 0; | 589 | return 0; |
| 579 | } | 590 | } |
| 580 | 591 | ||
| 592 | static inline int regulator_suspend_enable(struct regulator_dev *rdev, | ||
| 593 | suspend_state_t state) | ||
| 594 | { | ||
| 595 | return -EINVAL; | ||
| 596 | } | ||
| 597 | |||
| 598 | static inline int regulator_suspend_disable(struct regulator_dev *rdev, | ||
| 599 | suspend_state_t state) | ||
| 600 | { | ||
| 601 | return -EINVAL; | ||
| 602 | } | ||
| 603 | |||
| 604 | static inline int regulator_set_suspend_voltage(struct regulator *regulator, | ||
| 605 | int min_uV, int max_uV, | ||
| 606 | suspend_state_t state) | ||
| 607 | { | ||
| 608 | return -EINVAL; | ||
| 609 | } | ||
| 610 | |||
| 581 | static inline void *regulator_get_drvdata(struct regulator *regulator) | 611 | static inline void *regulator_get_drvdata(struct regulator *regulator) |
| 582 | { | 612 | { |
| 583 | return NULL; | 613 | return NULL; |