diff options
-rw-r--r-- | drivers/regulator/ab8500.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 4efe3cf25083..51ff569384df 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c | |||
@@ -29,7 +29,6 @@ | |||
29 | /** | 29 | /** |
30 | * struct ab8500_regulator_info - ab8500 regulator information | 30 | * struct ab8500_regulator_info - ab8500 regulator information |
31 | * @desc: regulator description | 31 | * @desc: regulator description |
32 | * @ab8500: ab8500 parent | ||
33 | * @regulator_dev: regulator device | 32 | * @regulator_dev: regulator device |
34 | * @max_uV: maximum voltage (for variable voltage supplies) | 33 | * @max_uV: maximum voltage (for variable voltage supplies) |
35 | * @min_uV: minimum voltage (for variable voltage supplies) | 34 | * @min_uV: minimum voltage (for variable voltage supplies) |
@@ -47,7 +46,6 @@ | |||
47 | struct ab8500_regulator_info { | 46 | struct ab8500_regulator_info { |
48 | struct device *dev; | 47 | struct device *dev; |
49 | struct regulator_desc desc; | 48 | struct regulator_desc desc; |
50 | struct ab8500 *ab8500; | ||
51 | struct regulator_dev *regulator; | 49 | struct regulator_dev *regulator; |
52 | int max_uV; | 50 | int max_uV; |
53 | int min_uV; | 51 | int min_uV; |
@@ -345,19 +343,6 @@ static struct ab8500_regulator_info ab8500_regulator_info[] = { | |||
345 | AB8500_FIXED_LDO(ANA, 1200, 0x04, 0x06, 0xc, 0x4), | 343 | AB8500_FIXED_LDO(ANA, 1200, 0x04, 0x06, 0xc, 0x4), |
346 | }; | 344 | }; |
347 | 345 | ||
348 | static inline struct ab8500_regulator_info *find_regulator_info(int id) | ||
349 | { | ||
350 | struct ab8500_regulator_info *info; | ||
351 | int i; | ||
352 | |||
353 | for (i = 0; i < ARRAY_SIZE(ab8500_regulator_info); i++) { | ||
354 | info = &ab8500_regulator_info[i]; | ||
355 | if (info->desc.id == id) | ||
356 | return info; | ||
357 | } | ||
358 | return NULL; | ||
359 | } | ||
360 | |||
361 | static __devinit int ab8500_regulator_probe(struct platform_device *pdev) | 346 | static __devinit int ab8500_regulator_probe(struct platform_device *pdev) |
362 | { | 347 | { |
363 | struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); | 348 | struct ab8500 *ab8500 = dev_get_drvdata(pdev->dev.parent); |
@@ -383,7 +368,6 @@ static __devinit int ab8500_regulator_probe(struct platform_device *pdev) | |||
383 | /* assign per-regulator data */ | 368 | /* assign per-regulator data */ |
384 | info = &ab8500_regulator_info[i]; | 369 | info = &ab8500_regulator_info[i]; |
385 | info->dev = &pdev->dev; | 370 | info->dev = &pdev->dev; |
386 | info->ab8500 = ab8500; | ||
387 | 371 | ||
388 | info->regulator = regulator_register(&info->desc, &pdev->dev, | 372 | info->regulator = regulator_register(&info->desc, &pdev->dev, |
389 | &pdata->regulator[i], info); | 373 | &pdata->regulator[i], info); |