diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:41 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2020-10-21 09:58:41 -0500 |
| commit | 1f287b5ce5e7df4ad8190ed03c440adee5c79cd0 (patch) | |
| tree | 38aea151f10b5332f43bbe772af679d84c88f86f /drivers | |
| parent | 29828fc20ab1c5d2f41e2749921c4bd32da6c38e (diff) | |
| parent | 9846155b00fe56273b3265f85bef8b39b15305eb (diff) | |
Merge branch 'remotes/lorenzo/pci/loongson'
* remotes/lorenzo/pci/loongson:
PCI: loongson: Simplify loongson_pci_probe() return expression
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/controller/pci-loongson.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/pci/controller/pci-loongson.c b/drivers/pci/controller/pci-loongson.c index 719c19fe2bfb..48169b1e3817 100644 --- a/drivers/pci/controller/pci-loongson.c +++ b/drivers/pci/controller/pci-loongson.c @@ -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 = { |