Patchwork [13/27] drivers/pci/host: don't check resource with devm_ioremap_resource

login
register
mail settings
Submitter Wolfram Sang
Date July 23, 2013, 6:01 p.m.
Message ID <1374602524-3398-14-git-send-email-wsa@the-dreams.de>
Download mbox | patch
Permalink /patch/261171/
State Not Applicable
Headers show

Comments

Wolfram Sang - July 23, 2013, 6:01 p.m.
devm_ioremap_resource does sanity checks on the given resource. No need to
duplicate this in the driver.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
Please apply via the subsystem-tree.

 drivers/pci/host/pcie-designware.c |   12 ------------
 1 file changed, 12 deletions(-)
Bjorn Helgaas - July 23, 2013, 6:12 p.m.
[+cc Jingoo]

On Tue, Jul 23, 2013 at 12:01 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> devm_ioremap_resource does sanity checks on the given resource. No need to
> duplicate this in the driver.
>
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

Jingoo, I can apply this, or if you have other pcie-designware.c
updates this cycle, you can fold it into those.  Just let me know what
you'd prefer.

Bjorn


>  drivers/pci/host/pcie-designware.c |   12 ------------
>  1 file changed, 12 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
> index 26bdbda..f0ba6ef 100644
> --- a/drivers/pci/host/pcie-designware.c
> +++ b/drivers/pci/host/pcie-designware.c
> @@ -817,28 +817,16 @@ static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev)
>         int ret;
>
>         elbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -       if (!elbi_base) {
> -               dev_err(&pdev->dev, "couldn't get elbi base resource\n");
> -               return -EINVAL;
> -       }
>         pp->elbi_base = devm_ioremap_resource(&pdev->dev, elbi_base);
>         if (IS_ERR(pp->elbi_base))
>                 return PTR_ERR(pp->elbi_base);
>
>         phy_base = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> -       if (!phy_base) {
> -               dev_err(&pdev->dev, "couldn't get phy base resource\n");
> -               return -EINVAL;
> -       }
>         pp->phy_base = devm_ioremap_resource(&pdev->dev, phy_base);
>         if (IS_ERR(pp->phy_base))
>                 return PTR_ERR(pp->phy_base);
>
>         purple_base = platform_get_resource(pdev, IORESOURCE_MEM, 2);
> -       if (!purple_base) {
> -               dev_err(&pdev->dev, "couldn't get purple base resource\n");
> -               return -EINVAL;
> -       }
>         pp->purple_base = devm_ioremap_resource(&pdev->dev, purple_base);
>         if (IS_ERR(pp->purple_base))
>                 return PTR_ERR(pp->purple_base);
> --
> 1.7.10.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jingoo Han - July 23, 2013, 11:17 p.m.
On Wednesday, July 24, 2013 3:13 AM, Bjorn Helgaas wrote:
> On Tue, Jul 23, 2013 at 12:01 PM, Wolfram Sang <wsa@the-dreams.de> wrote:
> > devm_ioremap_resource does sanity checks on the given resource. No need to
> > duplicate this in the driver.
> >
> > Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> 
> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> 
> Jingoo, I can apply this, or if you have other pcie-designware.c
> updates this cycle, you can fold it into those.  Just let me know what
> you'd prefer.

Hi Bjorn Helgaas,

I will send other updates for pcie-designware.c.
I will fold it into those.
Thank you.

Best regards,
Jingoo Han



--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 26bdbda..f0ba6ef 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -817,28 +817,16 @@  static int add_pcie_port(struct pcie_port *pp, struct platform_device *pdev)
 	int ret;
 
 	elbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!elbi_base) {
-		dev_err(&pdev->dev, "couldn't get elbi base resource\n");
-		return -EINVAL;
-	}
 	pp->elbi_base = devm_ioremap_resource(&pdev->dev, elbi_base);
 	if (IS_ERR(pp->elbi_base))
 		return PTR_ERR(pp->elbi_base);
 
 	phy_base = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-	if (!phy_base) {
-		dev_err(&pdev->dev, "couldn't get phy base resource\n");
-		return -EINVAL;
-	}
 	pp->phy_base = devm_ioremap_resource(&pdev->dev, phy_base);
 	if (IS_ERR(pp->phy_base))
 		return PTR_ERR(pp->phy_base);
 
 	purple_base = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-	if (!purple_base) {
-		dev_err(&pdev->dev, "couldn't get purple base resource\n");
-		return -EINVAL;
-	}
 	pp->purple_base = devm_ioremap_resource(&pdev->dev, purple_base);
 	if (IS_ERR(pp->purple_base))
 		return PTR_ERR(pp->purple_base);