Skip to content

Commit

Permalink
regulator: lm363x: Remove struct lm363x_regulator which is not necessary
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Axel Lin authored and Mark Brown committed Nov 30, 2015
1 parent eaea7d2 commit a8bc6ca
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions drivers/regulator/lm363x-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,12 @@
#define LM363X_STEP_50mV 50000
#define LM363X_STEP_500mV 500000

struct lm363x_regulator {
struct regmap *regmap;
struct regulator_dev *regulator;
};

const int ldo_cont_enable_time[] = {
0, 2000, 5000, 10000, 20000, 50000, 100000, 200000,
};

static int lm363x_regulator_enable_time(struct regulator_dev *rdev)
{
struct lm363x_regulator *lm363x_regulator = rdev_get_drvdata(rdev);
enum lm363x_regulator_id id = rdev_get_id(rdev);
u8 val, addr, mask;

Expand All @@ -77,7 +71,7 @@ static int lm363x_regulator_enable_time(struct regulator_dev *rdev)
return 0;
}

if (regmap_read(lm363x_regulator->regmap, addr, (unsigned int *)&val))
if (regmap_read(rdev->regmap, addr, (unsigned int *)&val))
return -EINVAL;

val = (val & mask) >> LM3631_ENTIME_SHIFT;
Expand Down Expand Up @@ -244,23 +238,14 @@ static int lm363x_regulator_of_get_enable_gpio(struct device_node *np, int id)
static int lm363x_regulator_probe(struct platform_device *pdev)
{
struct ti_lmu *lmu = dev_get_drvdata(pdev->dev.parent);
struct lm363x_regulator *lm363x_regulator;
struct regmap *regmap = lmu->regmap;
struct regulator_config cfg = { };
struct regulator_dev *rdev;
struct device *dev = &pdev->dev;
int id = pdev->id;
int ret, ena_gpio;

lm363x_regulator = devm_kzalloc(dev, sizeof(*lm363x_regulator),
GFP_KERNEL);
if (!lm363x_regulator)
return -ENOMEM;

lm363x_regulator->regmap = regmap;

cfg.dev = dev;
cfg.driver_data = lm363x_regulator;
cfg.regmap = regmap;

/*
Expand Down Expand Up @@ -288,9 +273,6 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
return ret;
}

lm363x_regulator->regulator = rdev;
platform_set_drvdata(pdev, lm363x_regulator);

return 0;
}

Expand Down

0 comments on commit a8bc6ca

Please sign in to comment.