From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: Lee Jones <lee.jones@linaro.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-rtc@vger.kernel.org
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Sylwester Nawrocki <snawrocki@kernel.org>
Subject: [PATCH 9/9] regulator: s2mps11: Drop initialization via platform data
Date: Tue, 20 Apr 2021 19:02:44 +0200 [thread overview]
Message-ID: <20210420170244.13467-5-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210420170244.13467-1-krzysztof.kozlowski@canonical.com>
None of the platforms with S2MPS11 use board files, so any
initialization via platform data can be safely removed.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
drivers/regulator/s2mps11.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 33cf84bce05a..ebc67e3ddd4f 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -1120,7 +1120,6 @@ static const struct regulator_desc s2mpu02_regulators[] = {
static int s2mps11_pmic_probe(struct platform_device *pdev)
{
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
- struct sec_platform_data *pdata = NULL;
struct of_regulator_match *rdata = NULL;
struct regulator_config config = { };
struct s2mps11_info *s2mps11;
@@ -1171,17 +1170,6 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
if (!s2mps11->ext_control_gpiod)
return -ENOMEM;
- if (!iodev->dev->of_node) {
- if (iodev->pdata) {
- pdata = iodev->pdata;
- goto common_reg;
- } else {
- dev_err(pdev->dev.parent,
- "Platform data or DT node not supplied\n");
- return -ENODEV;
- }
- }
-
rdata = kcalloc(rdev_num, sizeof(*rdata), GFP_KERNEL);
if (!rdata)
return -ENOMEM;
@@ -1193,7 +1181,6 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
if (ret)
goto out;
-common_reg:
platform_set_drvdata(pdev, s2mps11);
config.dev = &pdev->dev;
@@ -1202,13 +1189,8 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
for (i = 0; i < rdev_num; i++) {
struct regulator_dev *regulator;
- if (pdata) {
- config.init_data = pdata->regulators[i].initdata;
- config.of_node = pdata->regulators[i].reg_node;
- } else {
- config.init_data = rdata[i].init_data;
- config.of_node = rdata[i].of_node;
- }
+ config.init_data = rdata[i].init_data;
+ config.of_node = rdata[i].of_node;
config.ena_gpiod = s2mps11->ext_control_gpiod[i];
/*
* Hand the GPIO descriptor management over to the regulator
--
2.25.1
next prev parent reply other threads:[~2021-04-20 17:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 17:01 [PATCH 0/9] mfd/rtc/regulator: Drop board file support for Samsung PMIC Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 1/9] mfd: sec: Drop support for board files and require devicetree Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 2/9] mfd: sec: Remove unused cfg_pmic_irq in platform data Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 3/9] mfd: sec: Remove unused device_type " Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 4/9] mfd: sec: Remove unused irq_base " Krzysztof Kozlowski
2021-04-20 17:02 ` [PATCH 5/9] mfd: sec: Enable wakeup from suspend via devicetree property Krzysztof Kozlowski
2021-04-20 17:02 ` [PATCH 6/9] mfd: sec: Remove unused platform data members Krzysztof Kozlowski
2021-04-20 17:02 ` [PATCH 7/9] rtc: s5m: Remove reference to parent's device pdata Krzysztof Kozlowski
2021-04-20 17:02 ` [PATCH 8/9] regulator: s2mpa01: Drop initialization via platform data Krzysztof Kozlowski
2021-04-20 17:02 ` Krzysztof Kozlowski [this message]
2021-04-21 19:03 ` (subset) [PATCH 0/9] mfd/rtc/regulator: Drop board file support for Samsung PMIC Mark Brown
2021-04-29 21:29 ` Alexandre Belloni
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=20210420170244.13467-5-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=b.zolnierkie@samsung.com \
--cc=broonie@kernel.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=snawrocki@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).