summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-06-04 17:38:08 -0400
committerBjorn Helgaas <bhelgaas@google.com>2015-06-08 08:56:21 -0400
commitd59d36a7fce6707acae644621320a75ab93f1856 (patch)
tree5b1105eab0f413b9b9f71f76f2d5b7d15d00fa7a
parent633adc711de0bcb6d6e1c071302880e0c8c05d57 (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>
-rw-r--r--arch/ia64/include/asm/pci.h13
-rw-r--r--arch/microblaze/include/asm/pci.h13
-rw-r--r--arch/mn10300/include/asm/pci.h13
-rw-r--r--include/asm-generic/pci.h13
4 files changed, 0 insertions, 52 deletions
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 52af5ed9f60b..32ea19ac5713 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -108,19 +108,6 @@ static inline int pci_proc_domain(struct pci_bus *bus)
108 return (pci_domain_nr(bus) != 0); 108 return (pci_domain_nr(bus) != 0);
109} 109}
110 110
111static inline struct resource *
112pcibios_select_root(struct pci_dev *pdev, struct resource *res)
113{
114 struct resource *root = NULL;
115
116 if (res->flags & IORESOURCE_IO)
117 root = &ioport_resource;
118 if (res->flags & IORESOURCE_MEM)
119 root = &iomem_resource;
120
121 return root;
122}
123
124#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ 111#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
125static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 112static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
126{ 113{
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index 468aca8cec0d..95b03886e0a8 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -83,19 +83,6 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus,
83 */ 83 */
84#define PCI_DMA_BUS_IS_PHYS (1) 84#define PCI_DMA_BUS_IS_PHYS (1)
85 85
86static inline struct resource *pcibios_select_root(struct pci_dev *pdev,
87 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
99extern void pcibios_claim_one_bus(struct pci_bus *b); 86extern void pcibios_claim_one_bus(struct pci_bus *b);
100 87
101extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); 88extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
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
86static inline struct resource *
87pcibios_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
99static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 86static 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;
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index e80a0495e5b0..f24bc519bf31 100644
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -6,19 +6,6 @@
6#ifndef _ASM_GENERIC_PCI_H 6#ifndef _ASM_GENERIC_PCI_H
7#define _ASM_GENERIC_PCI_H 7#define _ASM_GENERIC_PCI_H
8 8
9static inline struct resource *
10pcibios_select_root(struct pci_dev *pdev, struct resource *res)
11{
12 struct resource *root = NULL;
13
14 if (res->flags & IORESOURCE_IO)
15 root = &ioport_resource;
16 if (res->flags & IORESOURCE_MEM)
17 root = &iomem_resource;
18
19 return root;
20}
21
22#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ 9#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
23static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 10static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
24{ 11{