Explorar o código

pci: pci-lantiq: remove duplicate check on resource

Sanity check on resource happening with devm_ioremap_resource()

Signed-off-by: Varka Bhadram <varkab@cdac.in>
Acked-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: Varka Bhadram <varkab@cdac.in>
Patchwork: https://patchwork.linux-mips.org/patch/8199/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Varka Bhadram %!s(int64=10) %!d(string=hai) anos
pai
achega
5a1e73ffe5
Modificáronse 1 ficheiros con 1 adicións e 6 borrados
  1. 1 6
      arch/mips/pci/pci-lantiq.c

+ 1 - 6
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);
 	pci_clear_flags(PCI_PROBE_ONLY);
 
 
-	res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1);
 	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);
 	ltq_pci_membase = devm_ioremap_resource(&pdev->dev, res_bridge);
 	if (IS_ERR(ltq_pci_membase))
 	if (IS_ERR(ltq_pci_membase))
 		return PTR_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);
 	ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg);
 	if (IS_ERR(ltq_pci_mapped_cfg))
 	if (IS_ERR(ltq_pci_mapped_cfg))
 		return PTR_ERR(ltq_pci_mapped_cfg);
 		return PTR_ERR(ltq_pci_mapped_cfg);