4.4-stable review patch. If anyone has any objections, please let me know.
------------------
This reverts commit b1999fa6e8145305a6c8bda30ea20783717708e6 which was
commit 70a7fb80e85ae7f78f8e90cec3fbd862ea6a4d4b upstream.
It causes run-time breakage in the 4.4-stable tree and more patches are
needed to be applied first before this one in order to resolve the
issue.
Reported-by: Guenter Roeck <li...@roeck-us.net>
Cc: Mark Brown <broo...@kernel.org>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Thierry Reding <tred...@nvidia.com>
Cc: Mark Brown <broo...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/regulator/core.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -132,14 +132,6 @@ static bool have_full_constraints(void)
return has_full_constraints || of_have_populated_dt();
}
-static inline struct regulator_dev *rdev_get_supply(struct regulator_dev *rdev)
-{
- if (rdev && rdev->supply)
- return rdev->supply->rdev;
-
- return NULL;
-}
-
/**
* regulator_lock_supply - lock a regulator and its supplies
* @rdev: regulator source
@@ -148,7 +140,7 @@ static void regulator_lock_supply(struct
{
int i;
- for (i = 0; rdev->supply; rdev = rdev_get_supply(rdev), i++)
+ for (i = 0; rdev->supply; rdev = rdev->supply->rdev, i++)
mutex_lock_nested(&rdev->mutex, i);
}
