UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Axel Lin 2019-04-30 19:13:45 +08:00 committed by Mark Brown
parent e219c2b3dc
commit 7bcbdbe01f
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/regulator/stm32-pwr.c
View File

@ -40,7 +40,6 @@ static u32 ready_mask_table[STM32PWR_REG_NUM_REGS] = {
struct stm32_pwr_reg { struct stm32_pwr_reg {
void __iomem *base; void __iomem *base;
const struct regulator_desc *desc;
u32 ready_mask; 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); 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) 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; u32 val;
val = readl_relaxed(priv->base + REG_PWR_CR3); 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); writel_relaxed(val, priv->base + REG_PWR_CR3);
/* use an arbitrary timeout of 20ms */ /* use an arbitrary timeout of 20ms */
@ -90,7 +89,7 @@ static int stm32_pwr_reg_disable(struct regulator_dev *rdev)
u32 val; u32 val;
val = readl_relaxed(priv->base + REG_PWR_CR3); 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); writel_relaxed(val, priv->base + REG_PWR_CR3);
/* use an arbitrary timeout of 20ms */ /* use an arbitrary timeout of 20ms */
@ -153,7 +152,6 @@ static int stm32_pwr_regulator_probe(struct platform_device *pdev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->base = base; priv->base = base;
priv->desc = &stm32_pwr_desc[i];
priv->ready_mask = ready_mask_table[i]; priv->ready_mask = ready_mask_table[i];
config.driver_data = priv; config.driver_data = priv;