diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-04 17:38:08 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-06-08 08:56:21 -0400 |
commit | d59d36a7fce6707acae644621320a75ab93f1856 (patch) | |
tree | 5b1105eab0f413b9b9f71f76f2d5b7d15d00fa7a /arch/mn10300 | |
parent | 633adc711de0bcb6d6e1c071302880e0c8c05d57 (diff) |
PCI: Remove unused pcibios_select_root() (again)
a6c140969b46 ("Delete pcibios_select_root") removed pcibios_select_root().
But a7db50405216 ("PCI: remove pcibios_scan_all_fns()") added a few copies
back, probably with some incorrect merge conflict resolutions.
Remove the still-unused pcibios_select_root() definitions.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/mn10300')
-rw-r--r-- | arch/mn10300/include/asm/pci.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 5f70af25c7d0..c222d1792d5b 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
@@ -83,19 +83,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
83 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ | 83 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ |
84 | #include <asm-generic/pci-dma-compat.h> | 84 | #include <asm-generic/pci-dma-compat.h> |
85 | 85 | ||
86 | static inline struct resource * | ||
87 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
88 | { | ||
89 | struct resource *root = NULL; | ||
90 | |||
91 | if (res->flags & IORESOURCE_IO) | ||
92 | root = &ioport_resource; | ||
93 | if (res->flags & IORESOURCE_MEM) | ||
94 | root = &iomem_resource; | ||
95 | |||
96 | return root; | ||
97 | } | ||
98 | |||
99 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | 86 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) |
100 | { | 87 | { |
101 | return channel ? 15 : 14; | 88 | return channel ? 15 : 14; |