From: Lee Jones <lee.jones@linaro.org>
To: broonie@kernel.org, linus.walleij@linaro.org,
daniel.thompson@linaro.org, arnd@arndb.de
Cc: Lee Jones <lee.jones@linaro.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, dilinger@queued.net
Subject: [PATCH 2/4] mfd: cs5535-mfd: Remove mfd_cell->id hack
Date: Fri, 18 Oct 2019 13:56:06 +0100 [thread overview]
Message-ID: <20191018125608.5362-3-lee.jones@linaro.org> (raw)
In-Reply-To: <20191018125608.5362-1-lee.jones@linaro.org>
The current implementation abuses the platform 'id' mfd_cell member
to index into the correct resources entry. If we place all cells
into their numbered slots, we can cycle through all the cell entries
and only process the populated ones which avoids this behaviour.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/cs5535-mfd.c | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c
index 2c47afc22d24..b01e5bb4ed03 100644
--- a/drivers/mfd/cs5535-mfd.c
+++ b/drivers/mfd/cs5535-mfd.c
@@ -62,26 +62,22 @@ static int cs5535_mfd_res_disable(struct platform_device *pdev)
static struct resource cs5535_mfd_resources[NR_BARS];
static struct mfd_cell cs5535_mfd_cells[] = {
- {
- .id = SMB_BAR,
+ [SMB_BAR] = {
.name = "cs5535-smb",
.num_resources = 1,
.resources = &cs5535_mfd_resources[SMB_BAR],
},
- {
- .id = GPIO_BAR,
+ [GPIO_BAR] = {
.name = "cs5535-gpio",
.num_resources = 1,
.resources = &cs5535_mfd_resources[GPIO_BAR],
},
- {
- .id = MFGPT_BAR,
+ [MFGPT_BAR] = {
.name = "cs5535-mfgpt",
.num_resources = 1,
.resources = &cs5535_mfd_resources[MFGPT_BAR],
},
- {
- .id = PMS_BAR,
+ [PMS_BAR] = {
.name = "cs5535-pms",
.num_resources = 1,
.resources = &cs5535_mfd_resources[PMS_BAR],
@@ -89,8 +85,7 @@ static struct mfd_cell cs5535_mfd_cells[] = {
.enable = cs5535_mfd_res_enable,
.disable = cs5535_mfd_res_disable,
},
- {
- .id = ACPI_BAR,
+ [ACPI_BAR] = {
.name = "cs5535-acpi",
.num_resources = 1,
.resources = &cs5535_mfd_resources[ACPI_BAR],
@@ -115,16 +110,16 @@ static int cs5535_mfd_probe(struct pci_dev *pdev,
return err;
/* fill in IO range for each cell; subdrivers handle the region */
- for (i = 0; i < ARRAY_SIZE(cs5535_mfd_cells); i++) {
- int bar = cs5535_mfd_cells[i].id;
- struct resource *r = &cs5535_mfd_resources[bar];
+ for (i = 0; i < NR_BARS; i++) {
+ struct mfd_cell *cell = &cs5535_mfd_cells[i];
+ struct resource *r = &cs5535_mfd_resources[i];
- r->flags = IORESOURCE_IO;
- r->start = pci_resource_start(pdev, bar);
- r->end = pci_resource_end(pdev, bar);
+ if (!cell)
+ continue;
- /* id is used for temporarily storing BAR; unset it now */
- cs5535_mfd_cells[i].id = 0;
+ r->flags = IORESOURCE_IO;
+ r->start = pci_resource_start(pdev, i);
+ r->end = pci_resource_end(pdev, i);
}
err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE, cs5535_mfd_cells,
--
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-10-18 12:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 12:56 [PATCH 0/4] Remove mfd_clone_cell() from the MFD API Lee Jones
2019-10-18 12:56 ` [PATCH 1/4] mfd: cs5535-mfd: Use PLATFORM_DEVID_* defines and tidy error message Lee Jones
2019-10-18 12:56 ` Lee Jones [this message]
2019-10-18 16:54 ` [PATCH 2/4] mfd: cs5535-mfd: Remove mfd_cell->id hack Daniel Thompson
2019-10-18 12:56 ` [PATCH 3/4] mfd: cs5535-mfd: Register clients using their own dedicated MFD cell entries Lee Jones
2019-10-18 16:06 ` Daniel Thompson
2019-10-18 12:56 ` [PATCH 4/4] mfd: mfd-core: Remove mfd_clone_cell() 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=20191018125608.5362-3-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=daniel.thompson@linaro.org \
--cc=dilinger@queued.net \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.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).