openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

regulator: Add a pointer to aat2870_data in struct aat2870_regulator 

The reason we add *pdev in struct aat2870_regulator is to use it
to get a pointer to struct aat2870_data.
Save a pointer to struct aat2870_data instead of pdev in struct
aat2870_regulator, this change makes the intention more clear.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Jin Park <jinyoungp@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2012-03-02 09:28:44 +08:00 committed by Mark Brown
parent 48ee1160a4
commit b21bcd1ada
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/regulator/aat2870-regulator.c
View File

@ -31,7 +31,7 @@
#include <linux/mfd/aat2870.h> #include <linux/mfd/aat2870.h>
struct aat2870_regulator { struct aat2870_regulator {
struct platform_device *pdev; struct aat2870_data *aat2870;
struct regulator_desc desc; struct regulator_desc desc;
const int *voltages; /* uV */ const int *voltages; /* uV */
@ -60,7 +60,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
unsigned selector) unsigned selector)
{ {
struct aat2870_regulator *ri = rdev_get_drvdata(rdev); struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent); struct aat2870_data *aat2870 = ri->aat2870;
return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask, return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask,
selector << ri->voltage_shift); selector << ri->voltage_shift);
@ -69,7 +69,7 @@ static int aat2870_ldo_set_voltage_sel(struct regulator_dev *rdev,
static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev) static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
{ {
struct aat2870_regulator *ri = rdev_get_drvdata(rdev); struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent); struct aat2870_data *aat2870 = ri->aat2870;
u8 val; u8 val;
int ret; int ret;
@ -83,7 +83,7 @@ static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
static int aat2870_ldo_enable(struct regulator_dev *rdev) static int aat2870_ldo_enable(struct regulator_dev *rdev)
{ {
struct aat2870_regulator *ri = rdev_get_drvdata(rdev); struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent); struct aat2870_data *aat2870 = ri->aat2870;
return aat2870->update(aat2870, ri->enable_addr, ri->enable_mask, return aat2870->update(aat2870, ri->enable_addr, ri->enable_mask,
ri->enable_mask); ri->enable_mask);
@ -92,7 +92,7 @@ static int aat2870_ldo_enable(struct regulator_dev *rdev)
static int aat2870_ldo_disable(struct regulator_dev *rdev) static int aat2870_ldo_disable(struct regulator_dev *rdev)
{ {
struct aat2870_regulator *ri = rdev_get_drvdata(rdev); struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent); struct aat2870_data *aat2870 = ri->aat2870;
return aat2870->update(aat2870, ri->enable_addr, ri->enable_mask, 0); return aat2870->update(aat2870, ri->enable_addr, ri->enable_mask, 0);
} }
@ -100,7 +100,7 @@ static int aat2870_ldo_disable(struct regulator_dev *rdev)
static int aat2870_ldo_is_enabled(struct regulator_dev *rdev) static int aat2870_ldo_is_enabled(struct regulator_dev *rdev)
{ {
struct aat2870_regulator *ri = rdev_get_drvdata(rdev); struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent); struct aat2870_data *aat2870 = ri->aat2870;
u8 val; u8 val;
int ret; int ret;
@ -185,7 +185,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "Invalid device ID, %d\n", pdev->id); dev_err(&pdev->dev, "Invalid device ID, %d\n", pdev->id);
return -EINVAL; return -EINVAL;
} }
ri->pdev = pdev; ri->aat2870 = dev_get_drvdata(pdev->dev.parent);
rdev = regulator_register(&ri->desc, &pdev->dev, rdev = regulator_register(&ri->desc, &pdev->dev,
pdev->dev.platform_data, ri, NULL); pdev->dev.platform_data, ri, NULL);