Skip to content

Commit

Permalink
regulator: pwm-regulator: Diffientiate between dev (device) and rdev …
Browse files Browse the repository at this point in the history
…(regulator_dev)

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Lee Jones authored and Mark Brown committed Jun 8, 2015
1 parent c779ceb commit ab101e3
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/regulator/pwm-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ struct pwm_voltages {
unsigned int dutycycle;
};

static int pwm_regulator_get_voltage_sel(struct regulator_dev *dev)
static int pwm_regulator_get_voltage_sel(struct regulator_dev *rdev)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);

return drvdata->state;
}

static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev,
static int pwm_regulator_set_voltage_sel(struct regulator_dev *rdev,
unsigned selector)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);
unsigned int pwm_reg_period;
int dutycycle;
int ret;
Expand All @@ -53,27 +53,27 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev,

ret = pwm_config(drvdata->pwm, dutycycle, pwm_reg_period);
if (ret) {
dev_err(&dev->dev, "Failed to configure PWM\n");
dev_err(&rdev->dev, "Failed to configure PWM\n");
return ret;
}

drvdata->state = selector;

ret = pwm_enable(drvdata->pwm);
if (ret) {
dev_err(&dev->dev, "Failed to enable PWM\n");
dev_err(&rdev->dev, "Failed to enable PWM\n");
return ret;
}

return 0;
}

static int pwm_regulator_list_voltage(struct regulator_dev *dev,
static int pwm_regulator_list_voltage(struct regulator_dev *rdev,
unsigned selector)
{
struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev);
struct pwm_regulator_data *drvdata = rdev_get_drvdata(rdev);

if (selector >= dev->desc->n_voltages)
if (selector >= rdev->desc->n_voltages)
return -EINVAL;

return drvdata->duty_cycle_table[selector].uV;
Expand Down

0 comments on commit ab101e3

Please sign in to comment.