From: Lee Jones <lee.jones@linaro.org>
To: daniel.thompson@linaro.org, broonie@kernel.org
Cc: baohua@kernel.org, stephan@gerhold.net, arnd@arndb.de,
linus.walleij@linaro.org, linux-kernel@vger.kernel.org,
Lee Jones <lee.jones@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 04/10] mfd: cs5535-mfd: Register clients using their own dedicated MFD cell entries
Date: Fri, 1 Nov 2019 07:45:12 +0000 [thread overview]
Message-ID: <20191101074518.26228-5-lee.jones@linaro.org> (raw)
In-Reply-To: <20191101074518.26228-1-lee.jones@linaro.org>
CS5535 is the only user of mfd_clone_cell(). It makes more sense to
register child devices in the traditional way and remove the quite
bespoke mfd_clone_cell() call from the MFD API.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
---
drivers/mfd/cs5535-mfd.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index 3b569b231510..d0fb2e52ee76 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -50,16 +50,19 @@ static struct mfd_cell cs5535_mfd_cells[] = {
.num_resources = 1,
.resources = &cs5535_mfd_resources[PMS_BAR],
},
+};
+
+static struct mfd_cell cs5535_olpc_mfd_cells[] = {
{
- .name = "cs5535-acpi",
+ .name = "olpc-xo1-pm-acpi",
+ .num_resources = 1,
+ .resources = &cs5535_mfd_resources[ACPI_BAR],
+ },
+ {
+ .name = "olpc-xo1-sci-acpi",
.num_resources = 1,
.resources = &cs5535_mfd_resources[ACPI_BAR],
},
-};
-
-static const char *olpc_acpi_clones[] = {
- "olpc-xo1-pm-acpi",
- "olpc-xo1-sci-acpi"
};
static int cs5535_mfd_probe(struct pci_dev *pdev,
@@ -101,10 +104,14 @@ static int cs5535_mfd_probe(struct pci_dev *pdev,
goto err_remove_devices;
}
- err = mfd_clone_cell("cs5535-acpi", olpc_acpi_clones,
- ARRAY_SIZE(olpc_acpi_clones));
+ err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
+ cs5535_olpc_mfd_cells,
+ ARRAY_SIZE(cs5535_olpc_mfd_cells),
+ NULL, 0, NULL);
if (err) {
- dev_err(&pdev->dev, "Failed to clone MFD cell\n");
+ dev_err(&pdev->dev,
+ "Failed to add CS5535 OLPC sub-devices: %d\n",
+ err);
goto err_release_acpi;
}
}
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-11-01 7:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-01 7:45 [PATCH v4 00/10] Simplify MFD Core Lee Jones
2019-11-01 7:45 ` [PATCH v4 01/10] mfd: cs5535-mfd: Use PLATFORM_DEVID_* defines and tidy error message Lee Jones
2019-11-01 7:45 ` [PATCH v4 02/10] mfd: cs5535-mfd: Remove mfd_cell->id hack Lee Jones
2019-11-01 7:45 ` [PATCH v4 03/10] mfd: cs5535-mfd: Request shared IO regions centrally Lee Jones
2019-11-01 8:01 ` Daniel Thompson
2019-11-01 7:45 ` Lee Jones [this message]
2019-11-01 7:45 ` [PATCH v4 05/10] mfd: mfd-core: Protect against NULL call-back function pointer Lee Jones
2019-11-01 7:45 ` [PATCH v4 06/10] mfd: mfd-core: Remove mfd_clone_cell() Lee Jones
2019-11-01 7:45 ` [PATCH v4 07/10] x86: olpc-xo1-pm: Remove invocation of MFD's .enable()/.disable() call-backs Lee Jones
2019-11-01 7:45 ` [PATCH v4 08/10] x86: olpc-xo1-sci: " Lee Jones
2019-11-01 7:45 ` [PATCH v4 09/10] mfd: mfd-core: Remove usage counting for .{en, dis}able() call-backs Lee Jones
2019-11-01 7:45 ` [PATCH v4 10/10] mfd: mfd-core: Move pdev->mfd_cell creation back into mfd_add_device() Lee Jones
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=20191101074518.26228-5-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=baohua@kernel.org \
--cc=broonie@kernel.org \
--cc=daniel.thompson@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stephan@gerhold.net \
/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