Skip to content

Commit

Permalink
regulator: Fix useless O^2 complexity in suspend/resume
Browse files Browse the repository at this point in the history
regulator_pm_ops with regulator_suspend and regulator_resume functions are
assigned to every regulator device registered in the system, so there is no
need to iterate over all again in them. Replace class_for_each_device()
construction with direct operation on the rdev embedded in the given
regulator device. This saves a lots of useless operations in suspend and
resume paths.

Fixes: f7efad1: regulator: add PM suspend and resume hooks
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
mszyprow authored and broonie committed Sep 3, 2018
1 parent beb5a17 commit cd7e36a
Showing 1 changed file with 11 additions and 28 deletions.
39 changes: 11 additions & 28 deletions drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4464,19 +4464,6 @@ void regulator_unregister(struct regulator_dev *rdev)
EXPORT_SYMBOL_GPL(regulator_unregister);

#ifdef CONFIG_SUSPEND
static int _regulator_suspend(struct device *dev, void *data)
{
struct regulator_dev *rdev = dev_to_rdev(dev);
suspend_state_t *state = data;
int ret;

regulator_lock(rdev);
ret = suspend_set_state(rdev, *state);
regulator_unlock(rdev);

return ret;
}

/**
* regulator_suspend - prepare regulators for system wide suspend
* @state: system suspend state
Expand All @@ -4485,20 +4472,25 @@ static int _regulator_suspend(struct device *dev, void *data)
*/
static int regulator_suspend(struct device *dev)
{
struct regulator_dev *rdev = dev_to_rdev(dev);
suspend_state_t state = pm_suspend_target_state;
int ret;

regulator_lock(rdev);
ret = suspend_set_state(rdev, state);
regulator_unlock(rdev);

return class_for_each_device(&regulator_class, NULL, &state,
_regulator_suspend);
return ret;
}

static int _regulator_resume(struct device *dev, void *data)
static int regulator_resume(struct device *dev)
{
int ret = 0;
suspend_state_t state = pm_suspend_target_state;
struct regulator_dev *rdev = dev_to_rdev(dev);
suspend_state_t *state = data;
struct regulator_state *rstate;
int ret = 0;

rstate = regulator_get_suspend_state(rdev, *state);
rstate = regulator_get_suspend_state(rdev, state);
if (rstate == NULL)
return 0;

Expand All @@ -4513,15 +4505,6 @@ static int _regulator_resume(struct device *dev, void *data)

return ret;
}

static int regulator_resume(struct device *dev)
{
suspend_state_t state = pm_suspend_target_state;

return class_for_each_device(&regulator_class, NULL, &state,
_regulator_resume);
}

#else /* !CONFIG_SUSPEND */

#define regulator_suspend NULL
Expand Down

0 comments on commit cd7e36a

Please sign in to comment.