@@ -40,7 +40,6 @@ static u32 ready_mask_table[STM32PWR_REG_NUM_REGS] = {
40
40
41
41
struct stm32_pwr_reg {
42
42
void __iomem * base ;
43
- const struct regulator_desc * desc ;
44
43
u32 ready_mask ;
45
44
};
46
45
@@ -61,7 +60,7 @@ static int stm32_pwr_reg_is_enabled(struct regulator_dev *rdev)
61
60
62
61
val = readl_relaxed (priv -> base + REG_PWR_CR3 );
63
62
64
- return (val & priv -> desc -> enable_mask );
63
+ return (val & rdev -> desc -> enable_mask );
65
64
}
66
65
67
66
static int stm32_pwr_reg_enable (struct regulator_dev * rdev )
@@ -71,7 +70,7 @@ static int stm32_pwr_reg_enable(struct regulator_dev *rdev)
71
70
u32 val ;
72
71
73
72
val = readl_relaxed (priv -> base + REG_PWR_CR3 );
74
- val |= priv -> desc -> enable_mask ;
73
+ val |= rdev -> desc -> enable_mask ;
75
74
writel_relaxed (val , priv -> base + REG_PWR_CR3 );
76
75
77
76
/* use an arbitrary timeout of 20ms */
@@ -90,7 +89,7 @@ static int stm32_pwr_reg_disable(struct regulator_dev *rdev)
90
89
u32 val ;
91
90
92
91
val = readl_relaxed (priv -> base + REG_PWR_CR3 );
93
- val &= ~priv -> desc -> enable_mask ;
92
+ val &= ~rdev -> desc -> enable_mask ;
94
93
writel_relaxed (val , priv -> base + REG_PWR_CR3 );
95
94
96
95
/* use an arbitrary timeout of 20ms */
@@ -153,7 +152,6 @@ static int stm32_pwr_regulator_probe(struct platform_device *pdev)
153
152
if (!priv )
154
153
return - ENOMEM ;
155
154
priv -> base = base ;
156
- priv -> desc = & stm32_pwr_desc [i ];
157
155
priv -> ready_mask = ready_mask_table [i ];
158
156
config .driver_data = priv ;
159
157
0 commit comments