Skip to content

Commit 7bcbdbe

Browse files
AxelLinbroonie
authored andcommitted
regulator: stm32-pwr: Remove unneeded *desc from struct stm32_pwr_reg
Just use rdev->desc instead. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent e219c2b commit 7bcbdbe

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/regulator/stm32-pwr.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ static u32 ready_mask_table[STM32PWR_REG_NUM_REGS] = {
4040

4141
struct stm32_pwr_reg {
4242
void __iomem *base;
43-
const struct regulator_desc *desc;
4443
u32 ready_mask;
4544
};
4645

@@ -61,7 +60,7 @@ static int stm32_pwr_reg_is_enabled(struct regulator_dev *rdev)
6160

6261
val = readl_relaxed(priv->base + REG_PWR_CR3);
6362

64-
return (val & priv->desc->enable_mask);
63+
return (val & rdev->desc->enable_mask);
6564
}
6665

6766
static int stm32_pwr_reg_enable(struct regulator_dev *rdev)
@@ -71,7 +70,7 @@ static int stm32_pwr_reg_enable(struct regulator_dev *rdev)
7170
u32 val;
7271

7372
val = readl_relaxed(priv->base + REG_PWR_CR3);
74-
val |= priv->desc->enable_mask;
73+
val |= rdev->desc->enable_mask;
7574
writel_relaxed(val, priv->base + REG_PWR_CR3);
7675

7776
/* use an arbitrary timeout of 20ms */
@@ -90,7 +89,7 @@ static int stm32_pwr_reg_disable(struct regulator_dev *rdev)
9089
u32 val;
9190

9291
val = readl_relaxed(priv->base + REG_PWR_CR3);
93-
val &= ~priv->desc->enable_mask;
92+
val &= ~rdev->desc->enable_mask;
9493
writel_relaxed(val, priv->base + REG_PWR_CR3);
9594

9695
/* use an arbitrary timeout of 20ms */
@@ -153,7 +152,6 @@ static int stm32_pwr_regulator_probe(struct platform_device *pdev)
153152
if (!priv)
154153
return -ENOMEM;
155154
priv->base = base;
156-
priv->desc = &stm32_pwr_desc[i];
157155
priv->ready_mask = ready_mask_table[i];
158156
config.driver_data = priv;
159157

0 commit comments

Comments
 (0)