diff options
-rw-r--r-- | drivers/pci/host/pci-keystone.c | 2 | ||||
-rw-r--r-- | drivers/pci/host/pci-layerscape.c | 1 | ||||
-rw-r--r-- | drivers/pci/host/pci-tegra.c | 13 | ||||
-rw-r--r-- | drivers/pci/host/pcie-rcar.c | 4 |
4 files changed, 3 insertions, 17 deletions
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c index 78f79e31ac5c..23a1d97db1dd 100644 --- a/drivers/pci/host/pci-keystone.c +++ b/drivers/pci/host/pci-keystone.c | |||
@@ -197,7 +197,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, | |||
197 | */ | 197 | */ |
198 | for (temp = 0; temp < max_host_irqs; temp++) { | 198 | for (temp = 0; temp < max_host_irqs; temp++) { |
199 | host_irqs[temp] = irq_of_parse_and_map(*np_temp, temp); | 199 | host_irqs[temp] = irq_of_parse_and_map(*np_temp, temp); |
200 | if (host_irqs[temp] < 0) | 200 | if (!host_irqs[temp]) |
201 | break; | 201 | break; |
202 | } | 202 | } |
203 | if (temp) { | 203 | if (temp) { |
diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c index 6697b1a4d4fa..68c9e5e9b0a8 100644 --- a/drivers/pci/host/pci-layerscape.c +++ b/drivers/pci/host/pci-layerscape.c | |||
@@ -167,7 +167,6 @@ MODULE_DEVICE_TABLE(of, ls_pcie_of_match); | |||
167 | static struct platform_driver ls_pcie_driver = { | 167 | static struct platform_driver ls_pcie_driver = { |
168 | .driver = { | 168 | .driver = { |
169 | .name = "layerscape-pcie", | 169 | .name = "layerscape-pcie", |
170 | .owner = THIS_MODULE, | ||
171 | .of_match_table = ls_pcie_of_match, | 170 | .of_match_table = ls_pcie_of_match, |
172 | }, | 171 | }, |
173 | }; | 172 | }; |
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index a800ae916394..6f9c29fa70e7 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c | |||
@@ -625,19 +625,6 @@ static void tegra_pcie_port_free(struct tegra_pcie_port *port) | |||
625 | devm_kfree(pcie->dev, port); | 625 | devm_kfree(pcie->dev, port); |
626 | } | 626 | } |
627 | 627 | ||
628 | static void tegra_pcie_fixup_bridge(struct pci_dev *dev) | ||
629 | { | ||
630 | u16 reg; | ||
631 | |||
632 | if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE) { | ||
633 | pci_read_config_word(dev, PCI_COMMAND, ®); | ||
634 | reg |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY | | ||
635 | PCI_COMMAND_MASTER | PCI_COMMAND_SERR); | ||
636 | pci_write_config_word(dev, PCI_COMMAND, reg); | ||
637 | } | ||
638 | } | ||
639 | DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_fixup_bridge); | ||
640 | |||
641 | /* Tegra PCIE root complex wrongly reports device class */ | 628 | /* Tegra PCIE root complex wrongly reports device class */ |
642 | static void tegra_pcie_fixup_class(struct pci_dev *dev) | 629 | static void tegra_pcie_fixup_class(struct pci_dev *dev) |
643 | { | 630 | { |
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index ba28078b70e3..c57bd0ac39a0 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c | |||
@@ -754,7 +754,7 @@ static int rcar_pcie_get_resources(struct platform_device *pdev, | |||
754 | goto err_map_reg; | 754 | goto err_map_reg; |
755 | 755 | ||
756 | i = irq_of_parse_and_map(pdev->dev.of_node, 0); | 756 | i = irq_of_parse_and_map(pdev->dev.of_node, 0); |
757 | if (i < 0) { | 757 | if (!i) { |
758 | dev_err(pcie->dev, "cannot get platform resources for msi interrupt\n"); | 758 | dev_err(pcie->dev, "cannot get platform resources for msi interrupt\n"); |
759 | err = -ENOENT; | 759 | err = -ENOENT; |
760 | goto err_map_reg; | 760 | goto err_map_reg; |
@@ -762,7 +762,7 @@ static int rcar_pcie_get_resources(struct platform_device *pdev, | |||
762 | pcie->msi.irq1 = i; | 762 | pcie->msi.irq1 = i; |
763 | 763 | ||
764 | i = irq_of_parse_and_map(pdev->dev.of_node, 1); | 764 | i = irq_of_parse_and_map(pdev->dev.of_node, 1); |
765 | if (i < 0) { | 765 | if (!i) { |
766 | dev_err(pcie->dev, "cannot get platform resources for msi interrupt\n"); | 766 | dev_err(pcie->dev, "cannot get platform resources for msi interrupt\n"); |
767 | err = -ENOENT; | 767 | err = -ENOENT; |
768 | goto err_map_reg; | 768 | goto err_map_reg; |