2011-05-09 09:40:59

by Mark Brown

Subject: [PATCH] regulator: Factor out references to rdev in regulator_force_disable()

Don't go looking up the rdev pointer every time, just use a local variable
like everything else.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/regulator/core.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index c5b3c50..58452ac 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -1508,13 +1508,14 @@ static int _regulator_force_disable(struct regulator_dev *rdev,
*/
int regulator_force_disable(struct regulator *regulator)
{
+ struct regulator_dev *rdev = regulator->rdev;
struct regulator_dev *supply_rdev = NULL;
int ret;

- mutex_lock(&regulator->rdev->mutex);
+ mutex_lock(&rdev->mutex);
regulator->uA_load = 0;
- ret = _regulator_force_disable(regulator->rdev, &supply_rdev);
- mutex_unlock(&regulator->rdev->mutex);
+ ret = _regulator_force_disable(rdev, &supply_rdev);
+ mutex_unlock(&rdev->mutex);

if (supply_rdev)
regulator_disable(get_device_regulator(rdev_get_dev(supply_rdev)));
--
1.7.4.1

2011-05-09 16:02:32

by Liam Girdwood

Subject: Re: [PATCH] regulator: Factor out references to rdev in regulator_force_disable()

On Mon, 2011-05-09 at 11:41 +0200, Mark Brown wrote:
> Don't go looking up the rdev pointer every time, just use a local variable
> like everything else.
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> drivers/regulator/core.c | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index c5b3c50..58452ac 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -1508,13 +1508,14 @@ static int _regulator_force_disable(struct regulator_dev *rdev,
> */
> int regulator_force_disable(struct regulator *regulator)
> {
> + struct regulator_dev *rdev = regulator->rdev;
> struct regulator_dev *supply_rdev = NULL;
> int ret;
>
> - mutex_lock(&regulator->rdev->mutex);
> + mutex_lock(&rdev->mutex);
> regulator->uA_load = 0;
> - ret = _regulator_force_disable(regulator->rdev, &supply_rdev);
> - mutex_unlock(&regulator->rdev->mutex);
> + ret = _regulator_force_disable(rdev, &supply_rdev);
> + mutex_unlock(&rdev->mutex);
>
> if (supply_rdev)
> regulator_disable(get_device_regulator(rdev_get_dev(supply_rdev)));


Applied.

Thanks

Liam