[PATCH 1/4] PCI: imx6: Use devm_platform_get_and_ioremap_resource()

[PATCH 1/4] PCI: imx6: Use devm_platform_get_and_ioremap_resource()

[Yangtao Li]

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 27aaa2a6bf39..6bf7ad2f7b48 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1282,8 +1282,7 @@ static int imx6_pcie_probe(struct platform_device *pdev)
 			return PTR_ERR(imx6_pcie->phy_base);
 	}
 
-	dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	pci->dbi_base = devm_ioremap_resource(dev, dbi_base);
+	pci->dbi_base = devm_platform_get_and_ioremap_resource(pdev, 0, &dbi_base);
 	if (IS_ERR(pci->dbi_base))
 		return PTR_ERR(pci->dbi_base);
 
-- 
2.39.0

[PATCH 2/4] PCI: rcar-gen2: Use devm_platform_get_and_ioremap_resource()

[Yangtao Li]

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/pci/controller/pci-rcar-gen2.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/controller/pci-rcar-gen2.c b/drivers/pci/controller/pci-rcar-gen2.c
index 839695791757..d29866485361 100644
--- a/drivers/pci/controller/pci-rcar-gen2.c
+++ b/drivers/pci/controller/pci-rcar-gen2.c
@@ -290,8 +290,7 @@ static int rcar_pci_probe(struct platform_device *pdev)
 	priv = pci_host_bridge_priv(bridge);
 	bridge->sysdata = priv;
 
-	cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	reg = devm_ioremap_resource(dev, cfg_res);
+	reg = devm_platform_get_and_ioremap_resource(pdev, 0, &cfg_res);
 	if (IS_ERR(reg))
 		return PTR_ERR(reg);
 
-- 
2.39.0

Re: [PATCH 2/4] PCI: rcar-gen2: Use devm_platform_get_and_ioremap_resource()

[Geert Uytterhoeven]

On Thu, Jul 6, 2023 at 11:27 AM Yangtao Li <frank.li@vivo.com> wrote:
> Convert platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

[PATCH 3/4] PCI: v3-semi: Use devm_platform_get_and_ioremap_resource()

[Yangtao Li]

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/pci/controller/pci-v3-semi.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
index ca44b0c83d1b..0f993328dba2 100644
--- a/drivers/pci/controller/pci-v3-semi.c
+++ b/drivers/pci/controller/pci-v3-semi.c
@@ -736,8 +736,7 @@ static int v3_pci_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	v3->base = devm_ioremap_resource(dev, regs);
+	v3->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(v3->base))
 		return PTR_ERR(v3->base);
 	/*
@@ -750,15 +749,14 @@ static int v3_pci_probe(struct platform_device *pdev)
 			readl(v3->base + V3_LB_IO_BASE), regs);
 
 	/* Configuration space is 16MB directly mapped */
-	regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+	v3->config_base = devm_platform_get_and_ioremap_resource(pdev, 1, &res);
+	if (IS_ERR(v3->config_base))
+		return PTR_ERR(v3->config_base);
 	if (resource_size(regs) != SZ_16M) {
 		dev_err(dev, "config mem is not 16MB!\n");
 		return -EINVAL;
 	}
 	v3->config_mem = regs->start;
-	v3->config_base = devm_ioremap_resource(dev, regs);
-	if (IS_ERR(v3->config_base))
-		return PTR_ERR(v3->config_base);
 
 	/* Get and request error IRQ resource */
 	irq = platform_get_irq(pdev, 0);
-- 
2.39.0

Re: [PATCH 3/4] PCI: v3-semi: Use devm_platform_get_and_ioremap_resource()

[Linus Walleij]

On Thu, Jul 6, 2023 at 11:21 AM Yangtao Li <frank.li@vivo.com> wrote:

> Convert platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.
>
> Signed-off-by: Yangtao Li <frank.li@vivo.com>

Looks correct.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 3/4] PCI: v3-semi: Use devm_platform_get_and_ioremap_resource()

[Krzysztof Wilczyński]

[+Cc Yang]

Hello,

> Convert platform_get_resource(), devm_ioremap_resource() to a single
> call to devm_platform_get_and_ioremap_resource(), as this is exactly
> what this function does.

A very similar series was posted a while ago.  Patches 1, 2 and 4 in this
series are identical, except for this patch, which adds one more very nice
refactoring,

The other series:

  https://lore.kernel.org/linux-pci/20230626110226.GA569947@rocinante

What I can do would be to pick this patch and squash it with the other ones
that are already applied.  I will then attribute both you and Yang Li as
the authors.  Let me know if this is fine with you, Yangtao and Yang.

That said...

> diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
> index ca44b0c83d1b..0f993328dba2 100644
> --- a/drivers/pci/controller/pci-v3-semi.c
> +++ b/drivers/pci/controller/pci-v3-semi.c
> @@ -736,8 +736,7 @@ static int v3_pci_probe(struct platform_device *pdev)
>  		return ret;
>  	}
>  
> -	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	v3->base = devm_ioremap_resource(dev, regs);
> +	v3->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

Are you sure about the variable name here? This might be a small copy-and-paste
mistake that snuck up here.  Have a closer look, or better yet, try to compile
and test this. :)

> -	regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> +	v3->config_base = devm_platform_get_and_ioremap_resource(pdev, 1, &res);

Same as above.

> +	if (IS_ERR(v3->config_base))
> +		return PTR_ERR(v3->config_base);
>  	if (resource_size(regs) != SZ_16M) {
>  		dev_err(dev, "config mem is not 16MB!\n");
>  		return -EINVAL;
>  	}
>  	v3->config_mem = regs->start;
> -	v3->config_base = devm_ioremap_resource(dev, regs);
> -	if (IS_ERR(v3->config_base))
> -		return PTR_ERR(v3->config_base);

This could be made such that the assignments are together.

	Krzysztof

Re: [PATCH 3/4] PCI: v3-semi: Use devm_platform_get_and_ioremap_resource()

[Yangtao Li]

On 2023/7/7 2:55, Krzysztof Wilczyński wrote:

> [+Cc Yang]
>
> Hello,
>
>> Convert platform_get_resource(), devm_ioremap_resource() to a single
>> call to devm_platform_get_and_ioremap_resource(), as this is exactly
>> what this function does.
> A very similar series was posted a while ago.  Patches 1, 2 and 4 in this
> series are identical, except for this patch, which adds one more very nice
> refactoring,
>
> The other series:
>
>    https://lore.kernel.org/linux-pci/20230626110226.GA569947@rocinante
>
> What I can do would be to pick this patch and squash it with the other ones
> that are already applied.  I will then attribute both you and Yang Li as
> the authors.  Let me know if this is fine with you, Yangtao and Yang.


Acked-by: Yangtao Li <frank.li@vivo.com>

Thx,
Yangtao


>
> That said...
>
>> diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
>> index ca44b0c83d1b..0f993328dba2 100644
>> --- a/drivers/pci/controller/pci-v3-semi.c
>> +++ b/drivers/pci/controller/pci-v3-semi.c
>> @@ -736,8 +736,7 @@ static int v3_pci_probe(struct platform_device *pdev)
>>   		return ret;
>>   	}
>>   
>> -	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>> -	v3->base = devm_ioremap_resource(dev, regs);
>> +	v3->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
> Are you sure about the variable name here? This might be a small copy-and-paste
> mistake that snuck up here.  Have a closer look, or better yet, try to compile
> and test this. :)
>
>> -	regs = platform_get_resource(pdev, IORESOURCE_MEM, 1);
>> +	v3->config_base = devm_platform_get_and_ioremap_resource(pdev, 1, &res);
> Same as above.
>
>> +	if (IS_ERR(v3->config_base))
>> +		return PTR_ERR(v3->config_base);
>>   	if (resource_size(regs) != SZ_16M) {
>>   		dev_err(dev, "config mem is not 16MB!\n");
>>   		return -EINVAL;
>>   	}
>>   	v3->config_mem = regs->start;
>> -	v3->config_base = devm_ioremap_resource(dev, regs);
>> -	if (IS_ERR(v3->config_base))
>> -		return PTR_ERR(v3->config_base);
> This could be made such that the assignments are together.
>
> 	Krzysztof

[PATCH 4/4] PCI: xgene-msi: Use devm_platform_get_and_ioremap_resource()

[Yangtao Li]

Convert platform_get_resource(), devm_ioremap_resource() to a single
call to devm_platform_get_and_ioremap_resource(), as this is exactly
what this function does.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 drivers/pci/controller/pci-xgene-msi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/pci/controller/pci-xgene-msi.c b/drivers/pci/controller/pci-xgene-msi.c
index d7987b281f79..d7e09f264d52 100644
--- a/drivers/pci/controller/pci-xgene-msi.c
+++ b/drivers/pci/controller/pci-xgene-msi.c
@@ -443,8 +443,7 @@ static int xgene_msi_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, xgene_msi);
 
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	xgene_msi->msi_regs = devm_ioremap_resource(&pdev->dev, res);
+	xgene_msi->msi_regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
 	if (IS_ERR(xgene_msi->msi_regs)) {
 		rc = PTR_ERR(xgene_msi->msi_regs);
 		goto error;
-- 
2.39.0