Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b21bcd1ada026cd90243311e89dd8d999fe0a227

Authored by Axel Lin
Committed by Mark Brown
1 parent 48ee1160a4
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

drivers/regulator/aat2870-regulator.c
Diff comments   View file @ b21bcd1
... ... @@ -31,7 +31,7 @@
31 31 #include <linux/mfd/aat2870.h>
32 32  
33 33 struct aat2870_regulator {
34   - struct platform_device *pdev;
  34 + struct aat2870_data *aat2870;
35 35 struct regulator_desc desc;
36 36  
37 37 const int *voltages; /* uV */
... ... @@ -60,7 +60,7 @@
60 60 unsigned selector)
61 61 {
62 62 struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
63   - struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
  63 + struct aat2870_data *aat2870 = ri->aat2870;
64 64  
65 65 return aat2870->update(aat2870, ri->voltage_addr, ri->voltage_mask,
66 66 selector << ri->voltage_shift);
... ... @@ -69,7 +69,7 @@
69 69 static int aat2870_ldo_get_voltage_sel(struct regulator_dev *rdev)
70 70 {
71 71 struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
72   - struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
  72 + struct aat2870_data *aat2870 = ri->aat2870;
73 73 u8 val;
74 74 int ret;
75 75  
... ... @@ -83,7 +83,7 @@
83 83 static int aat2870_ldo_enable(struct regulator_dev *rdev)
84 84 {
85 85 struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
86   - struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
  86 + struct aat2870_data *aat2870 = ri->aat2870;
87 87  
88 88 return aat2870->update(aat2870, ri->enable_addr, ri->enable_mask,
89 89 ri->enable_mask);
... ... @@ -92,7 +92,7 @@
92 92 static int aat2870_ldo_disable(struct regulator_dev *rdev)
93 93 {
94 94 struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
95   - struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
  95 + struct aat2870_data *aat2870 = ri->aat2870;
96 96  
97 97 return aat2870->update(aat2870, ri->enable_addr, ri->enable_mask, 0);
98 98 }
... ... @@ -100,7 +100,7 @@
100 100 static int aat2870_ldo_is_enabled(struct regulator_dev *rdev)
101 101 {
102 102 struct aat2870_regulator *ri = rdev_get_drvdata(rdev);
103   - struct aat2870_data *aat2870 = dev_get_drvdata(ri->pdev->dev.parent);
  103 + struct aat2870_data *aat2870 = ri->aat2870;
104 104 u8 val;
105 105 int ret;
106 106  
... ... @@ -185,7 +185,7 @@
185 185 dev_err(&pdev->dev, "Invalid device ID, %d\n", pdev->id);
186 186 return -EINVAL;
187 187 }
188   - ri->pdev = pdev;
  188 + ri->aat2870 = dev_get_drvdata(pdev->dev.parent);
189 189  
190 190 rdev = regulator_register(&ri->desc, &pdev->dev,
191 191 pdev->dev.platform_data, ri, NULL);