diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-09 15:36:52 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-09 15:36:52 -0400 |
commit | e3dc17a53f9649d0a67ec69ec883e781fa9dd920 (patch) | |
tree | d8c61fcc6d5da36ba3372c63f9a3cf248d16e423 /drivers/pci | |
parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) |
PCI: layerscape: Simplify platform_get_resource_byname() failure checking
devm_ioremap_resource() validates the resource it receives, so if we check
for devm_ioremap_resource() failure, we need not check for failure of the
preceding platform_get_resource().
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/host/pci-layerscape.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c index 68c9e5e9b0a8..4a6e62f67579 100644 --- a/drivers/pci/host/pci-layerscape.c +++ b/drivers/pci/host/pci-layerscape.c | |||
@@ -127,14 +127,11 @@ static int __init ls_pcie_probe(struct platform_device *pdev) | |||
127 | pcie->dev = &pdev->dev; | 127 | pcie->dev = &pdev->dev; |
128 | 128 | ||
129 | dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); | 129 | dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); |
130 | if (!dbi_base) { | ||
131 | dev_err(&pdev->dev, "missing *regs* space\n"); | ||
132 | return -ENODEV; | ||
133 | } | ||
134 | |||
135 | pcie->dbi = devm_ioremap_resource(&pdev->dev, dbi_base); | 130 | pcie->dbi = devm_ioremap_resource(&pdev->dev, dbi_base); |
136 | if (IS_ERR(pcie->dbi)) | 131 | if (IS_ERR(pcie->dbi)) { |
132 | dev_err(&pdev->dev, "missing *regs* space\n"); | ||
137 | return PTR_ERR(pcie->dbi); | 133 | return PTR_ERR(pcie->dbi); |
134 | } | ||
138 | 135 | ||
139 | pcie->scfg = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, | 136 | pcie->scfg = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, |
140 | "fsl,pcie-scfg"); | 137 | "fsl,pcie-scfg"); |