diff options
Diffstat (limited to 'drivers/pci/host/pci-mvebu.c')
-rw-r--r-- | drivers/pci/host/pci-mvebu.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 80b2250ea19a..c269e430c760 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c | |||
@@ -665,19 +665,6 @@ static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys) | |||
665 | return 1; | 665 | return 1; |
666 | } | 666 | } |
667 | 667 | ||
668 | static int mvebu_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | ||
669 | { | ||
670 | struct of_irq oirq; | ||
671 | int ret; | ||
672 | |||
673 | ret = of_irq_map_pci(dev, &oirq); | ||
674 | if (ret) | ||
675 | return ret; | ||
676 | |||
677 | return irq_create_of_mapping(oirq.controller, oirq.specifier, | ||
678 | oirq.size); | ||
679 | } | ||
680 | |||
681 | static struct pci_bus *mvebu_pcie_scan_bus(int nr, struct pci_sys_data *sys) | 668 | static struct pci_bus *mvebu_pcie_scan_bus(int nr, struct pci_sys_data *sys) |
682 | { | 669 | { |
683 | struct mvebu_pcie *pcie = sys_to_pcie(sys); | 670 | struct mvebu_pcie *pcie = sys_to_pcie(sys); |
@@ -732,7 +719,7 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie) | |||
732 | hw.private_data = (void **)&pcie; | 719 | hw.private_data = (void **)&pcie; |
733 | hw.setup = mvebu_pcie_setup; | 720 | hw.setup = mvebu_pcie_setup; |
734 | hw.scan = mvebu_pcie_scan_bus; | 721 | hw.scan = mvebu_pcie_scan_bus; |
735 | hw.map_irq = mvebu_pcie_map_irq; | 722 | hw.map_irq = of_irq_parse_and_map_pci; |
736 | hw.ops = &mvebu_pcie_ops; | 723 | hw.ops = &mvebu_pcie_ops; |
737 | hw.align_resource = mvebu_pcie_align_resource; | 724 | hw.align_resource = mvebu_pcie_align_resource; |
738 | hw.add_bus = mvebu_pcie_add_bus; | 725 | hw.add_bus = mvebu_pcie_add_bus; |