Commit 1f287b5c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/loongson'

* remotes/lorenzo/pci/loongson:
  PCI: loongson: Simplify loongson_pci_probe() return expression
parents 29828fc2 9846155b
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ static int loongson_pci_probe(struct platform_device *pdev)
	struct device_node *node = dev->of_node;
	struct pci_host_bridge *bridge;
	struct resource *regs;
	int err;

	if (!node)
		return -ENODEV;
@@ -222,11 +221,7 @@ static int loongson_pci_probe(struct platform_device *pdev)
	bridge->ops = &loongson_pci_ops;
	bridge->map_irq = loongson_map_irq;

	err = pci_host_probe(bridge);
	if (err)
		return err;

	return 0;
	return pci_host_probe(bridge);
}

static struct platform_driver loongson_pci_driver = {