Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/regulator/pwm-regulator.c

+9 −9
Original line number Diff line number Diff line
@@ -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;
@@ -53,7 +53,7 @@ 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;

	}
@@ -61,19 +61,19 @@ static int pwm_regulator_set_voltage_sel(struct regulator_dev *dev, 


	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;