Commit ab101e35 authored by Lee Jones's avatar Lee Jones Committed by Mark Brown

regulator: pwm-regulator: Diffientiate between dev (device) and rdev (regulator_dev)

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c779cebb
...@@ -31,17 +31,17 @@ struct pwm_voltages { ...@@ -31,17 +31,17 @@ struct pwm_voltages {
unsigned int dutycycle; 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; 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) 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; unsigned int pwm_reg_period;
int dutycycle; int dutycycle;
int ret; int ret;
...@@ -53,7 +53,7 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev, ...@@ -53,7 +53,7 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev,
ret = pwm_config(drvdata->pwm, dutycycle, pwm_reg_period); ret = pwm_config(drvdata->pwm, dutycycle, pwm_reg_period);
if (ret) { if (ret) {
dev_err(&dev->dev, "Failed to configure PWM\n"); dev_err(&rdev->dev, "Failed to configure PWM\n");
return ret; return ret;
} }
...@@ -61,19 +61,19 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev, ...@@ -61,19 +61,19 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev,
ret = pwm_enable(drvdata->pwm); ret = pwm_enable(drvdata->pwm);
if (ret) { if (ret) {
dev_err(&dev->dev, "Failed to enable PWM\n"); dev_err(&rdev->dev, "Failed to enable PWM\n");
return ret; return ret;
} }
return 0; return 0;
} }
static int pwm_regulator_list_voltage(struct regulator_dev *dev, static int pwm_regulator_list_voltage(struct regulator_dev *rdev,
unsigned selector) 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 -EINVAL;
return drvdata->duty_cycle_table[selector].uV; return drvdata->duty_cycle_table[selector].uV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment