mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
regulator: core: Rely on regulator_dev_release to free constraints
As we now free the constraints in regulator_dev_release we will still
call free on the constraints pointer even if we went down an error
path in regulator_register, because it is only allocated after the
device_register. As such we no longer need to free rdev->constraints
on the error paths, so this patch removes said frees.
Fixes: 29f5f4860a
("regulator: core: Move more deallocation into class unregister")
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
92e963f50f
commit
6333ef46bb
1 changed files with 12 additions and 17 deletions
|
@ -1057,18 +1057,18 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
||||||
|
|
||||||
ret = machine_constraints_voltage(rdev, rdev->constraints);
|
ret = machine_constraints_voltage(rdev, rdev->constraints);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
goto out;
|
return ret;
|
||||||
|
|
||||||
ret = machine_constraints_current(rdev, rdev->constraints);
|
ret = machine_constraints_current(rdev, rdev->constraints);
|
||||||
if (ret != 0)
|
if (ret != 0)
|
||||||
goto out;
|
return ret;
|
||||||
|
|
||||||
if (rdev->constraints->ilim_uA && ops->set_input_current_limit) {
|
if (rdev->constraints->ilim_uA && ops->set_input_current_limit) {
|
||||||
ret = ops->set_input_current_limit(rdev,
|
ret = ops->set_input_current_limit(rdev,
|
||||||
rdev->constraints->ilim_uA);
|
rdev->constraints->ilim_uA);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
rdev_err(rdev, "failed to set input limit\n");
|
rdev_err(rdev, "failed to set input limit\n");
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1077,21 +1077,20 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
||||||
ret = suspend_prepare(rdev, rdev->constraints->initial_state);
|
ret = suspend_prepare(rdev, rdev->constraints->initial_state);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
rdev_err(rdev, "failed to set suspend state\n");
|
rdev_err(rdev, "failed to set suspend state\n");
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rdev->constraints->initial_mode) {
|
if (rdev->constraints->initial_mode) {
|
||||||
if (!ops->set_mode) {
|
if (!ops->set_mode) {
|
||||||
rdev_err(rdev, "no set_mode operation\n");
|
rdev_err(rdev, "no set_mode operation\n");
|
||||||
ret = -EINVAL;
|
return -EINVAL;
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = ops->set_mode(rdev, rdev->constraints->initial_mode);
|
ret = ops->set_mode(rdev, rdev->constraints->initial_mode);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
rdev_err(rdev, "failed to set initial mode: %d\n", ret);
|
rdev_err(rdev, "failed to set initial mode: %d\n", ret);
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1102,7 +1101,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
||||||
ret = _regulator_do_enable(rdev);
|
ret = _regulator_do_enable(rdev);
|
||||||
if (ret < 0 && ret != -EINVAL) {
|
if (ret < 0 && ret != -EINVAL) {
|
||||||
rdev_err(rdev, "failed to enable\n");
|
rdev_err(rdev, "failed to enable\n");
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1111,7 +1110,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
||||||
ret = ops->set_ramp_delay(rdev, rdev->constraints->ramp_delay);
|
ret = ops->set_ramp_delay(rdev, rdev->constraints->ramp_delay);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
rdev_err(rdev, "failed to set ramp_delay\n");
|
rdev_err(rdev, "failed to set ramp_delay\n");
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1119,7 +1118,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
||||||
ret = ops->set_pull_down(rdev);
|
ret = ops->set_pull_down(rdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
rdev_err(rdev, "failed to set pull down\n");
|
rdev_err(rdev, "failed to set pull down\n");
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1127,7 +1126,7 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
||||||
ret = ops->set_soft_start(rdev);
|
ret = ops->set_soft_start(rdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
rdev_err(rdev, "failed to set soft start\n");
|
rdev_err(rdev, "failed to set soft start\n");
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1136,16 +1135,12 @@ static int set_machine_constraints(struct regulator_dev *rdev,
|
||||||
ret = ops->set_over_current_protection(rdev);
|
ret = ops->set_over_current_protection(rdev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
rdev_err(rdev, "failed to set over current protection\n");
|
rdev_err(rdev, "failed to set over current protection\n");
|
||||||
goto out;
|
return ret;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
print_constraints(rdev);
|
print_constraints(rdev);
|
||||||
return 0;
|
return 0;
|
||||||
out:
|
|
||||||
kfree(rdev->constraints);
|
|
||||||
rdev->constraints = NULL;
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3979,7 +3974,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
|
||||||
|
|
||||||
scrub:
|
scrub:
|
||||||
regulator_ena_gpio_free(rdev);
|
regulator_ena_gpio_free(rdev);
|
||||||
kfree(rdev->constraints);
|
|
||||||
wash:
|
wash:
|
||||||
device_unregister(&rdev->dev);
|
device_unregister(&rdev->dev);
|
||||||
/* device core frees rdev */
|
/* device core frees rdev */
|
||||||
|
|
Loading…
Reference in a new issue