summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2019-04-30 14:13:45 +0300
committerMark Brown <broonie@kernel.org>2019-05-03 09:06:51 +0300
commit7bcbdbe01fa82712f8fece2a07ea30758b76403d (patch)
treef8e683e1151f236ad87cc98a5d8fe316631ded6f /drivers/regulator
parente219c2b3dc773a5a78f88ada9e07e281a9dad06b (diff)
downloadlinux-7bcbdbe01fa82712f8fece2a07ea30758b76403d.tar.xz
regulator: stm32-pwr: Remove unneeded *desc from struct stm32_pwr_reg
Just use rdev->desc instead. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/stm32-pwr.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/regulator/stm32-pwr.c b/drivers/regulator/stm32-pwr.c
index 7b39a41530d4..8bd15e4d2cea 100644
--- a/drivers/regulator/stm32-pwr.c
+++ b/drivers/regulator/stm32-pwr.c
@@ -40,7 +40,6 @@ static u32 ready_mask_table[STM32PWR_REG_NUM_REGS] = {
struct stm32_pwr_reg {
void __iomem *base;
- const struct regulator_desc *desc;
u32 ready_mask;
};
@@ -61,7 +60,7 @@ static int stm32_pwr_reg_is_enabled(struct regulator_dev *rdev)
val = readl_relaxed(priv->base + REG_PWR_CR3);
- return (val & priv->desc->enable_mask);
+ return (val & rdev->desc->enable_mask);
}
static int stm32_pwr_reg_enable(struct regulator_dev *rdev)
@@ -71,7 +70,7 @@ static int stm32_pwr_reg_enable(struct regulator_dev *rdev)
u32 val;
val = readl_relaxed(priv->base + REG_PWR_CR3);
- val |= priv->desc->enable_mask;
+ val |= rdev->desc->enable_mask;
writel_relaxed(val, priv->base + REG_PWR_CR3);
/* use an arbitrary timeout of 20ms */
@@ -90,7 +89,7 @@ static int stm32_pwr_reg_disable(struct regulator_dev *rdev)
u32 val;
val = readl_relaxed(priv->base + REG_PWR_CR3);
- val &= ~priv->desc->enable_mask;
+ val &= ~rdev->desc->enable_mask;
writel_relaxed(val, priv->base + REG_PWR_CR3);
/* use an arbitrary timeout of 20ms */
@@ -153,7 +152,6 @@ static int stm32_pwr_regulator_probe(struct platform_device *pdev)
if (!priv)
return -ENOMEM;
priv->base = base;
- priv->desc = &stm32_pwr_desc[i];
priv->ready_mask = ready_mask_table[i];
config.driver_data = priv;