Skip to content

Commit

Permalink
regulator: fixed: get rid of {get|list}_voltage()
Browse files Browse the repository at this point in the history
Provide the rail supply voltage through descriptor to the
core and remove the callbacks which implement the get_voltage
and list_voltage.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Laxman Dewangan authored and Mark Brown committed Sep 10, 2013
1 parent 5a52360 commit c368e5f
Showing 1 changed file with 2 additions and 26 deletions.
28 changes: 2 additions & 26 deletions drivers/regulator/fixed.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
struct fixed_voltage_data {
struct regulator_desc desc;
struct regulator_dev *dev;
int microvolts;
};


Expand Down Expand Up @@ -108,30 +107,7 @@ of_get_fixed_voltage_config(struct device *dev)
return config;
}

static int fixed_voltage_get_voltage(struct regulator_dev *dev)
{
struct fixed_voltage_data *data = rdev_get_drvdata(dev);

if (data->microvolts)
return data->microvolts;
else
return -EINVAL;
}

static int fixed_voltage_list_voltage(struct regulator_dev *dev,
unsigned selector)
{
struct fixed_voltage_data *data = rdev_get_drvdata(dev);

if (selector != 0)
return -EINVAL;

return data->microvolts;
}

static struct regulator_ops fixed_voltage_ops = {
.get_voltage = fixed_voltage_get_voltage,
.list_voltage = fixed_voltage_list_voltage,
};

static int reg_fixed_voltage_probe(struct platform_device *pdev)
Expand Down Expand Up @@ -186,7 +162,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
if (config->microvolts)
drvdata->desc.n_voltages = 1;

drvdata->microvolts = config->microvolts;
drvdata->desc.fixed_uV = config->microvolts;

if (config->gpio >= 0)
cfg.ena_gpio = config->gpio;
Expand Down Expand Up @@ -222,7 +198,7 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, drvdata);

dev_dbg(&pdev->dev, "%s supplying %duV\n", drvdata->desc.name,
drvdata->microvolts);
drvdata->desc.fixed_uV);

return 0;

Expand Down

0 comments on commit c368e5f

Please sign in to comment.