diff options
-rw-r--r-- | arch/alpha/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/arm/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/ia64/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/mips/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/mn10300/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/parisc/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/powerpc/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/sh/include/asm/pci.h | 13 | ||||
-rw-r--r-- | arch/sparc/include/asm/pci_64.h | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/pci.c | 13 | ||||
-rw-r--r-- | include/asm-generic/pci.h | 13 |
11 files changed, 0 insertions, 132 deletions
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h index cb04eaa6ba33..d22ace99d13d 100644 --- a/arch/alpha/include/asm/pci.h +++ b/arch/alpha/include/asm/pci.h | |||
@@ -237,19 +237,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *, struct pci_bus_region *, | |||
237 | extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 237 | extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
238 | struct pci_bus_region *region); | 238 | struct pci_bus_region *region); |
239 | 239 | ||
240 | static inline struct resource * | ||
241 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
242 | { | ||
243 | struct resource *root = NULL; | ||
244 | |||
245 | if (res->flags & IORESOURCE_IO) | ||
246 | root = &ioport_resource; | ||
247 | if (res->flags & IORESOURCE_MEM) | ||
248 | root = &iomem_resource; | ||
249 | |||
250 | return root; | ||
251 | } | ||
252 | |||
253 | #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index | 240 | #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index |
254 | 241 | ||
255 | static inline int pci_proc_domain(struct pci_bus *bus) | 242 | static inline int pci_proc_domain(struct pci_bus *bus) |
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 918d0cbbf064..0abf386ba3d3 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h | |||
@@ -65,19 +65,6 @@ extern void | |||
65 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 65 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
66 | struct pci_bus_region *region); | 66 | struct pci_bus_region *region); |
67 | 67 | ||
68 | static inline struct resource * | ||
69 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
70 | { | ||
71 | struct resource *root = NULL; | ||
72 | |||
73 | if (res->flags & IORESOURCE_IO) | ||
74 | root = &ioport_resource; | ||
75 | if (res->flags & IORESOURCE_MEM) | ||
76 | root = &iomem_resource; | ||
77 | |||
78 | return root; | ||
79 | } | ||
80 | |||
81 | /* | 68 | /* |
82 | * Dummy implementation; always return 0. | 69 | * Dummy implementation; always return 0. |
83 | */ | 70 | */ |
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 1d660d89db0d..fcfca56bb850 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h | |||
@@ -135,19 +135,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, | |||
135 | extern void pcibios_bus_to_resource(struct pci_dev *dev, | 135 | extern void pcibios_bus_to_resource(struct pci_dev *dev, |
136 | struct resource *res, struct pci_bus_region *region); | 136 | struct resource *res, struct pci_bus_region *region); |
137 | 137 | ||
138 | static inline struct resource * | ||
139 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
140 | { | ||
141 | struct resource *root = NULL; | ||
142 | |||
143 | if (res->flags & IORESOURCE_IO) | ||
144 | root = &ioport_resource; | ||
145 | if (res->flags & IORESOURCE_MEM) | ||
146 | root = &iomem_resource; | ||
147 | |||
148 | return root; | ||
149 | } | ||
150 | |||
151 | #define pcibios_scan_all_fns(a, b) 0 | 138 | #define pcibios_scan_all_fns(a, b) 0 |
152 | 139 | ||
153 | #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ | 140 | #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ |
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 053e4634acee..a68d111e55e9 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
@@ -142,19 +142,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, | |||
142 | extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 142 | extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
143 | struct pci_bus_region *region); | 143 | struct pci_bus_region *region); |
144 | 144 | ||
145 | static inline struct resource * | ||
146 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
147 | { | ||
148 | struct resource *root = NULL; | ||
149 | |||
150 | if (res->flags & IORESOURCE_IO) | ||
151 | root = &ioport_resource; | ||
152 | if (res->flags & IORESOURCE_MEM) | ||
153 | root = &iomem_resource; | ||
154 | |||
155 | return root; | ||
156 | } | ||
157 | |||
158 | #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index | 145 | #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index |
159 | 146 | ||
160 | static inline int pci_proc_domain(struct pci_bus *bus) | 147 | static inline int pci_proc_domain(struct pci_bus *bus) |
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 0517b45313d8..e58b9a46e1b1 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
@@ -106,19 +106,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev, | |||
106 | struct resource *res, | 106 | struct resource *res, |
107 | struct pci_bus_region *region); | 107 | struct pci_bus_region *region); |
108 | 108 | ||
109 | static inline struct resource * | ||
110 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
111 | { | ||
112 | struct resource *root = NULL; | ||
113 | |||
114 | if (res->flags & IORESOURCE_IO) | ||
115 | root = &ioport_resource; | ||
116 | if (res->flags & IORESOURCE_MEM) | ||
117 | root = &iomem_resource; | ||
118 | |||
119 | return root; | ||
120 | } | ||
121 | |||
122 | #define pcibios_scan_all_fns(a, b) 0 | 109 | #define pcibios_scan_all_fns(a, b) 0 |
123 | 110 | ||
124 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | 111 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) |
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h index 4ba868f44a5e..7d842d699df2 100644 --- a/arch/parisc/include/asm/pci.h +++ b/arch/parisc/include/asm/pci.h | |||
@@ -268,19 +268,6 @@ extern void | |||
268 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 268 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
269 | struct pci_bus_region *region); | 269 | struct pci_bus_region *region); |
270 | 270 | ||
271 | static inline struct resource * | ||
272 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
273 | { | ||
274 | struct resource *root = NULL; | ||
275 | |||
276 | if (res->flags & IORESOURCE_IO) | ||
277 | root = &ioport_resource; | ||
278 | if (res->flags & IORESOURCE_MEM) | ||
279 | root = &iomem_resource; | ||
280 | |||
281 | return root; | ||
282 | } | ||
283 | |||
284 | static inline void pcibios_penalize_isa_irq(int irq, int active) | 271 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
285 | { | 272 | { |
286 | /* We don't need to penalize isa irq's */ | 273 | /* We don't need to penalize isa irq's */ |
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index ba17d5d90a49..d9483c504d2d 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h | |||
@@ -195,19 +195,6 @@ extern void pcibios_bus_to_resource(struct pci_dev *dev, | |||
195 | struct resource *res, | 195 | struct resource *res, |
196 | struct pci_bus_region *region); | 196 | struct pci_bus_region *region); |
197 | 197 | ||
198 | static inline struct resource *pcibios_select_root(struct pci_dev *pdev, | ||
199 | struct resource *res) | ||
200 | { | ||
201 | struct resource *root = NULL; | ||
202 | |||
203 | if (res->flags & IORESOURCE_IO) | ||
204 | root = &ioport_resource; | ||
205 | if (res->flags & IORESOURCE_MEM) | ||
206 | root = &iomem_resource; | ||
207 | |||
208 | return root; | ||
209 | } | ||
210 | |||
211 | extern void pcibios_claim_one_bus(struct pci_bus *b); | 198 | extern void pcibios_claim_one_bus(struct pci_bus *b); |
212 | 199 | ||
213 | extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); | 200 | extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); |
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index ae0da6f48b6d..d3633f513ebc 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h | |||
@@ -137,19 +137,6 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev, | |||
137 | extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 137 | extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
138 | struct pci_bus_region *region); | 138 | struct pci_bus_region *region); |
139 | 139 | ||
140 | static inline struct resource * | ||
141 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
142 | { | ||
143 | struct resource *root = NULL; | ||
144 | |||
145 | if (res->flags & IORESOURCE_IO) | ||
146 | root = &ioport_resource; | ||
147 | if (res->flags & IORESOURCE_MEM) | ||
148 | root = &iomem_resource; | ||
149 | |||
150 | return root; | ||
151 | } | ||
152 | |||
153 | /* Chances are this interrupt is wired PC-style ... */ | 140 | /* Chances are this interrupt is wired PC-style ... */ |
154 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | 141 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) |
155 | { | 142 | { |
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h index 4f79a54948f6..7a1e3566e59c 100644 --- a/arch/sparc/include/asm/pci_64.h +++ b/arch/sparc/include/asm/pci_64.h | |||
@@ -191,8 +191,6 @@ extern void | |||
191 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 191 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
192 | struct pci_bus_region *region); | 192 | struct pci_bus_region *region); |
193 | 193 | ||
194 | extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *); | ||
195 | |||
196 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | 194 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) |
197 | { | 195 | { |
198 | return PCI_IRQ_NONE; | 196 | return PCI_IRQ_NONE; |
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c index 4638fba799e4..57859ad23547 100644 --- a/arch/sparc/kernel/pci.c +++ b/arch/sparc/kernel/pci.c | |||
@@ -711,19 +711,6 @@ void __devinit pcibios_fixup_bus(struct pci_bus *pbus) | |||
711 | pbus->resource[1] = &pbm->mem_space; | 711 | pbus->resource[1] = &pbm->mem_space; |
712 | } | 712 | } |
713 | 713 | ||
714 | struct resource *pcibios_select_root(struct pci_dev *pdev, struct resource *r) | ||
715 | { | ||
716 | struct pci_pbm_info *pbm = pdev->bus->sysdata; | ||
717 | struct resource *root = NULL; | ||
718 | |||
719 | if (r->flags & IORESOURCE_IO) | ||
720 | root = &pbm->io_space; | ||
721 | if (r->flags & IORESOURCE_MEM) | ||
722 | root = &pbm->mem_space; | ||
723 | |||
724 | return root; | ||
725 | } | ||
726 | |||
727 | void pcibios_update_irq(struct pci_dev *pdev, int irq) | 714 | void pcibios_update_irq(struct pci_dev *pdev, int irq) |
728 | { | 715 | { |
729 | } | 716 | } |
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h index 515c6e2e3218..b4326b5466eb 100644 --- a/include/asm-generic/pci.h +++ b/include/asm-generic/pci.h | |||
@@ -30,19 +30,6 @@ pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | |||
30 | res->end = region->end; | 30 | res->end = region->end; |
31 | } | 31 | } |
32 | 32 | ||
33 | static inline struct resource * | ||
34 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | ||
35 | { | ||
36 | struct resource *root = NULL; | ||
37 | |||
38 | if (res->flags & IORESOURCE_IO) | ||
39 | root = &ioport_resource; | ||
40 | if (res->flags & IORESOURCE_MEM) | ||
41 | root = &iomem_resource; | ||
42 | |||
43 | return root; | ||
44 | } | ||
45 | |||
46 | #define pcibios_scan_all_fns(a, b) 0 | 33 | #define pcibios_scan_all_fns(a, b) 0 |
47 | 34 | ||
48 | #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ | 35 | #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ |