Merge tag 'for-f2fs-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / pwm-regulator.c

diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
index a79b5bcfec1d7887b7a90ca1cba39138f0fb110e..ffa96124a5e7206f4f86f7025098a3744f9ec315 100644 (file)
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
@@ -23,7 +23,6 @@
 struct pwm_regulator_data {
        struct pwm_voltages *duty_cycle_table;
        struct pwm_device *pwm;
-       bool enabled;
        int state;
 };
 
@@ -32,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;
@@ -54,30 +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;
 
-       if (!drvdata->enabled) {
-               ret = pwm_enable(drvdata->pwm);
-               if (ret) {
-                       dev_err(&dev->dev, "Failed to enable PWM\n");
-                       return ret;
-               }
-               drvdata->enabled = true;
+       ret = pwm_enable(drvdata->pwm);
+       if (ret) {
+               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;