From: Axel Lin <axel.lin@ingics.com>
To: Mark Brown <broonie@kernel.org>
Cc: Pascal Paillet <p.paillet@st.com>,
Liam Girdwood <lgirdwood@gmail.com>,
linux-kernel@vger.kernel.org, Axel Lin <axel.lin@ingics.com>
Subject: [PATCH 1/2] regulator: stm32-pwr: Remove unneeded *desc from struct stm32_pwr_reg
Date: Tue, 30 Apr 2019 19:13:45 +0800 [thread overview]
Message-ID: <20190430111346.23427-1-axel.lin@ingics.com> (raw)
Just use rdev->desc instead.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/regulator/stm32-pwr.c | 8 +++-----
1 file 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;
--
2.17.1
next reply other threads:[~2019-04-30 11:14 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-30 11:13 Axel Lin [this message]
2019-04-30 11:13 ` [PATCH 2/2] regulator: stm32-pwr: Remove unneeded .min_uV and .list_volage Axel Lin
2019-05-03 6:18 ` Applied "regulator: stm32-pwr: Remove unneeded .min_uV and .list_volage" to the regulator tree Mark Brown
2019-05-03 6:21 ` Mark Brown
2019-05-03 6:23 ` Mark Brown
2019-05-03 6:18 ` Applied "regulator: stm32-pwr: Remove unneeded *desc from struct stm32_pwr_reg" " Mark Brown
2019-05-03 6:21 ` Mark Brown
2019-05-03 6:23 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190430111346.23427-1-axel.lin@ingics.com \
--to=axel.lin@ingics.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=p.paillet@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®