diff mbox series

[2/4] mfd: cs5535-mfd: Remove mfd_cell->id hack

Message ID 20191018125608.5362-3-lee.jones@linaro.org
State Superseded
Headers show
Series Remove mfd_clone_cell() from the MFD API | expand

Commit Message

Lee Jones Oct. 18, 2019, 12:56 p.m. UTC 
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(-)

-- 
2.17.1

Comments

Daniel Thompson Oct. 18, 2019, 4:54 p.m. UTC | #1 
On Fri, Oct 18, 2019 at 01:56:06PM +0100, Lee Jones wrote:
> 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

> @@ -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;


cell will never be null. Should this be cell->num_resources instead?


Daniel.
diff mbox series

Patch

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,