Discussion:
[PATCH mips] pci: pci-lantiq: remove duplicate check on resource
Varka Bhadram
2014-10-22 04:01:15 UTC
Permalink
Sanity check on resource happening with devm_ioremap_resource()

Signed-off-by: Varka Bhadram <***@cdac.in>
---

This patch based on master brnch of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/ralf/linux tree.

Thanks.

arch/mips/pci/pci-lantiq.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index 37fe8e7..d3ed15b 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -215,17 +215,12 @@ static int ltq_pci_probe(struct platform_device *pdev)

pci_clear_flags(PCI_PROBE_ONLY);

- res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- if (!res_cfg || !res_bridge) {
- dev_err(&pdev->dev, "missing memory resources\n");
- return -EINVAL;
- }
-
ltq_pci_membase = devm_ioremap_resource(&pdev->dev, res_bridge);
if (IS_ERR(ltq_pci_membase))
return PTR_ERR(ltq_pci_membase);

+ res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg);
if (IS_ERR(ltq_pci_mapped_cfg))
return PTR_ERR(ltq_pci_mapped_cfg);
--
1.7.9.5
John Crispin
2014-10-22 06:43:00 UTC
Permalink
Hi Vara,
Post by Varka Bhadram
Sanity check on resource happening with devm_ioremap_resource()
Acked-by: John Crispin <***@openwrt.org>


Thanks for the fix !
Post by Varka Bhadram
---
This patch based on master brnch of
https://kernel.googlesource.com/pub/scm/linux/kernel/git/ralf/linux tree.
Thanks.
arch/mips/pci/pci-lantiq.c | 7 +------ 1 file changed, 1
insertion(+), 6 deletions(-)
diff --git a/arch/mips/pci/pci-lantiq.c
b/arch/mips/pci/pci-lantiq.c index 37fe8e7..d3ed15b 100644 ---
*pdev)
pci_clear_flags(PCI_PROBE_ONLY);
- res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if
(!res_cfg || !res_bridge) { - dev_err(&pdev->dev, "missing memory
resources\n"); - return -EINVAL; - } - ltq_pci_membase =
devm_ioremap_resource(&pdev->dev, res_bridge); if
(IS_ERR(ltq_pci_membase)) return PTR_ERR(ltq_pci_membase);
+ res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg); if
(IS_ERR(ltq_pci_mapped_cfg)) return PTR_ERR(ltq_pci_mapped_cfg);
Loading...