diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-alpha/pci.h | 5 | ||||
-rw-r--r-- | include/asm-arm/pci.h | 4 | ||||
-rw-r--r-- | include/asm-cris/pci.h | 4 | ||||
-rw-r--r-- | include/asm-frv/pci.h | 4 | ||||
-rw-r--r-- | include/asm-h8300/pci.h | 4 | ||||
-rw-r--r-- | include/asm-i386/pci.h | 4 | ||||
-rw-r--r-- | include/asm-ia64/pci.h | 4 | ||||
-rw-r--r-- | include/asm-m68k/pci.h | 4 | ||||
-rw-r--r-- | include/asm-m68knommu/pci.h | 4 | ||||
-rw-r--r-- | include/asm-mips/pci.h | 4 | ||||
-rw-r--r-- | include/asm-parisc/pci.h | 4 | ||||
-rw-r--r-- | include/asm-powerpc/pci.h | 2 | ||||
-rw-r--r-- | include/asm-ppc/pci.h | 2 | ||||
-rw-r--r-- | include/asm-sh/pci.h | 4 | ||||
-rw-r--r-- | include/asm-sh64/pci.h | 4 | ||||
-rw-r--r-- | include/asm-sparc/pci.h | 4 | ||||
-rw-r--r-- | include/asm-sparc64/pci.h | 4 | ||||
-rw-r--r-- | include/asm-v850/pci.h | 4 | ||||
-rw-r--r-- | include/asm-x86_64/pci.h | 4 | ||||
-rw-r--r-- | include/asm-xtensa/pci.h | 4 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
21 files changed, 2 insertions, 77 deletions
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index 85aa1127c903..635d6f2b0b03 100644 --- a/include/asm-alpha/pci.h +++ b/include/asm-alpha/pci.h | |||
@@ -275,11 +275,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
275 | return hose->need_domain_info; | 275 | return hose->need_domain_info; |
276 | } | 276 | } |
277 | 277 | ||
278 | static inline void | ||
279 | pcibios_add_platform_entries(struct pci_dev *dev) | ||
280 | { | ||
281 | } | ||
282 | |||
283 | struct pci_dev *alpha_gendev_to_pci(struct device *dev); | 278 | struct pci_dev *alpha_gendev_to_pci(struct device *dev); |
284 | 279 | ||
285 | #endif /* __KERNEL__ */ | 280 | #endif /* __KERNEL__ */ |
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h index f21abd4ddac6..9299a3c1ac37 100644 --- a/include/asm-arm/pci.h +++ b/include/asm-arm/pci.h | |||
@@ -76,10 +76,6 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res) | |||
76 | return root; | 76 | return root; |
77 | } | 77 | } |
78 | 78 | ||
79 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
80 | { | ||
81 | } | ||
82 | |||
83 | #endif /* __KERNEL__ */ | 79 | #endif /* __KERNEL__ */ |
84 | 80 | ||
85 | #endif | 81 | #endif |
diff --git a/include/asm-cris/pci.h b/include/asm-cris/pci.h index b2ac8a331da1..5f1986ef7db1 100644 --- a/include/asm-cris/pci.h +++ b/include/asm-cris/pci.h | |||
@@ -89,10 +89,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
89 | enum pci_mmap_state mmap_state, int write_combine); | 89 | enum pci_mmap_state mmap_state, int write_combine); |
90 | 90 | ||
91 | 91 | ||
92 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
93 | { | ||
94 | } | ||
95 | |||
96 | #endif /* __KERNEL__ */ | 92 | #endif /* __KERNEL__ */ |
97 | 93 | ||
98 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ | 94 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ |
diff --git a/include/asm-frv/pci.h b/include/asm-frv/pci.h index f35a4511e7b9..3aee08c5a44f 100644 --- a/include/asm-frv/pci.h +++ b/include/asm-frv/pci.h | |||
@@ -22,10 +22,6 @@ struct pci_dev; | |||
22 | 22 | ||
23 | #define pcibios_assign_all_busses() 0 | 23 | #define pcibios_assign_all_busses() 0 |
24 | 24 | ||
25 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
26 | { | ||
27 | } | ||
28 | |||
29 | extern void pcibios_set_master(struct pci_dev *dev); | 25 | extern void pcibios_set_master(struct pci_dev *dev); |
30 | 26 | ||
31 | extern void pcibios_penalize_isa_irq(int irq); | 27 | extern void pcibios_penalize_isa_irq(int irq); |
diff --git a/include/asm-h8300/pci.h b/include/asm-h8300/pci.h index 0c771b05fdd5..97389b35aa35 100644 --- a/include/asm-h8300/pci.h +++ b/include/asm-h8300/pci.h | |||
@@ -22,8 +22,4 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
22 | 22 | ||
23 | #define PCI_DMA_BUS_IS_PHYS (1) | 23 | #define PCI_DMA_BUS_IS_PHYS (1) |
24 | 24 | ||
25 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
26 | { | ||
27 | } | ||
28 | |||
29 | #endif /* _ASM_H8300_PCI_H */ | 25 | #endif /* _ASM_H8300_PCI_H */ |
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h index 64b6d0baedbc..b974bd8ce9c6 100644 --- a/include/asm-i386/pci.h +++ b/include/asm-i386/pci.h | |||
@@ -94,10 +94,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
94 | enum pci_mmap_state mmap_state, int write_combine); | 94 | enum pci_mmap_state mmap_state, int write_combine); |
95 | 95 | ||
96 | 96 | ||
97 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
98 | { | ||
99 | } | ||
100 | |||
101 | #ifdef CONFIG_PCI | 97 | #ifdef CONFIG_PCI |
102 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 98 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
103 | enum pci_dma_burst_strategy *strat, | 99 | enum pci_dma_burst_strategy *strat, |
diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h index 5a5d1c2ce39d..26b69280f6c7 100644 --- a/include/asm-ia64/pci.h +++ b/include/asm-ia64/pci.h | |||
@@ -143,10 +143,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
143 | return (pci_domain_nr(bus) != 0); | 143 | return (pci_domain_nr(bus) != 0); |
144 | } | 144 | } |
145 | 145 | ||
146 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
147 | { | ||
148 | } | ||
149 | |||
150 | extern void pcibios_resource_to_bus(struct pci_dev *dev, | 146 | extern void pcibios_resource_to_bus(struct pci_dev *dev, |
151 | struct pci_bus_region *region, struct resource *res); | 147 | struct pci_bus_region *region, struct resource *res); |
152 | 148 | ||
diff --git a/include/asm-m68k/pci.h b/include/asm-m68k/pci.h index 9d2c07abe44f..678cb0b52314 100644 --- a/include/asm-m68k/pci.h +++ b/include/asm-m68k/pci.h | |||
@@ -54,8 +54,4 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
54 | */ | 54 | */ |
55 | #define PCI_DMA_BUS_IS_PHYS (1) | 55 | #define PCI_DMA_BUS_IS_PHYS (1) |
56 | 56 | ||
57 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
58 | { | ||
59 | } | ||
60 | |||
61 | #endif /* _ASM_M68K_PCI_H */ | 57 | #endif /* _ASM_M68K_PCI_H */ |
diff --git a/include/asm-m68knommu/pci.h b/include/asm-m68knommu/pci.h index e04c77e1184d..a99ce768f4a6 100644 --- a/include/asm-m68knommu/pci.h +++ b/include/asm-m68knommu/pci.h | |||
@@ -30,10 +30,6 @@ static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask) | |||
30 | */ | 30 | */ |
31 | #define pci_dac_dma_supported(pci_dev, mask) (0) | 31 | #define pci_dac_dma_supported(pci_dev, mask) (0) |
32 | 32 | ||
33 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
34 | { | ||
35 | } | ||
36 | |||
37 | #endif /* CONFIG_COMEMPCI */ | 33 | #endif /* CONFIG_COMEMPCI */ |
38 | 34 | ||
39 | #endif /* M68KNOMMU_PCI_H */ | 35 | #endif /* M68KNOMMU_PCI_H */ |
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h index a59d54749eef..6e8c5540bd27 100644 --- a/include/asm-mips/pci.h +++ b/include/asm-mips/pci.h | |||
@@ -181,10 +181,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
181 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ | 181 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ |
182 | #include <asm-generic/pci-dma-compat.h> | 182 | #include <asm-generic/pci-dma-compat.h> |
183 | 183 | ||
184 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
185 | { | ||
186 | } | ||
187 | |||
188 | /* Do platform specific device initialization at pci_enable_device() time */ | 184 | /* Do platform specific device initialization at pci_enable_device() time */ |
189 | extern int pcibios_plat_dev_init(struct pci_dev *dev); | 185 | extern int pcibios_plat_dev_init(struct pci_dev *dev); |
190 | 186 | ||
diff --git a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h index 7b3be9ac0dda..c331d49e4584 100644 --- a/include/asm-parisc/pci.h +++ b/include/asm-parisc/pci.h | |||
@@ -284,10 +284,6 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res) | |||
284 | return root; | 284 | return root; |
285 | } | 285 | } |
286 | 286 | ||
287 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
288 | { | ||
289 | } | ||
290 | |||
291 | static inline void pcibios_penalize_isa_irq(int irq, int active) | 287 | static inline void pcibios_penalize_isa_irq(int irq, int active) |
292 | { | 288 | { |
293 | /* We don't need to penalize isa irq's */ | 289 | /* We don't need to penalize isa irq's */ |
diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h index ce0f13e8eb14..b36a284bedf3 100644 --- a/include/asm-powerpc/pci.h +++ b/include/asm-powerpc/pci.h | |||
@@ -243,8 +243,6 @@ extern void of_scan_bus(struct device_node *node, struct pci_bus *bus); | |||
243 | 243 | ||
244 | extern int pci_read_irq_line(struct pci_dev *dev); | 244 | extern int pci_read_irq_line(struct pci_dev *dev); |
245 | 245 | ||
246 | extern void pcibios_add_platform_entries(struct pci_dev *dev); | ||
247 | |||
248 | struct file; | 246 | struct file; |
249 | extern pgprot_t pci_phys_mem_access_prot(struct file *file, | 247 | extern pgprot_t pci_phys_mem_access_prot(struct file *file, |
250 | unsigned long pfn, | 248 | unsigned long pfn, |
diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h index 9d162028dab9..0a66a6f1059a 100644 --- a/include/asm-ppc/pci.h +++ b/include/asm-ppc/pci.h | |||
@@ -145,8 +145,6 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res) | |||
145 | return root; | 145 | return root; |
146 | } | 146 | } |
147 | 147 | ||
148 | extern void pcibios_add_platform_entries(struct pci_dev *dev); | ||
149 | |||
150 | struct file; | 148 | struct file; |
151 | extern pgprot_t pci_phys_mem_access_prot(struct file *file, | 149 | extern pgprot_t pci_phys_mem_access_prot(struct file *file, |
152 | unsigned long pfn, | 150 | unsigned long pfn, |
diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h index b1f9a9e0231e..6f741f3a5d45 100644 --- a/include/asm-sh/pci.h +++ b/include/asm-sh/pci.h | |||
@@ -134,10 +134,6 @@ int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin); | |||
134 | int pciauto_assign_resources(int busno, struct pci_channel *hose); | 134 | int pciauto_assign_resources(int busno, struct pci_channel *hose); |
135 | #endif | 135 | #endif |
136 | 136 | ||
137 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
138 | { | ||
139 | } | ||
140 | |||
141 | #endif /* __KERNEL__ */ | 137 | #endif /* __KERNEL__ */ |
142 | 138 | ||
143 | /* generic pci stuff */ | 139 | /* generic pci stuff */ |
diff --git a/include/asm-sh64/pci.h b/include/asm-sh64/pci.h index aa8043089bb6..0a2b2bd48b87 100644 --- a/include/asm-sh64/pci.h +++ b/include/asm-sh64/pci.h | |||
@@ -104,10 +104,6 @@ extern void pcibios_fixup_irqs(void); | |||
104 | extern int pciauto_assign_resources(int busno, struct pci_channel *hose); | 104 | extern int pciauto_assign_resources(int busno, struct pci_channel *hose); |
105 | #endif | 105 | #endif |
106 | 106 | ||
107 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
108 | { | ||
109 | } | ||
110 | |||
111 | #endif /* __KERNEL__ */ | 107 | #endif /* __KERNEL__ */ |
112 | 108 | ||
113 | /* generic pci stuff */ | 109 | /* generic pci stuff */ |
diff --git a/include/asm-sparc/pci.h b/include/asm-sparc/pci.h index a750c688408b..a1ff7acc7644 100644 --- a/include/asm-sparc/pci.h +++ b/include/asm-sparc/pci.h | |||
@@ -154,10 +154,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
154 | } | 154 | } |
155 | #endif | 155 | #endif |
156 | 156 | ||
157 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
158 | { | ||
159 | } | ||
160 | |||
161 | #define PCI_DMA_ERROR_CODE (~(dma_addr_t)0x0) | 157 | #define PCI_DMA_ERROR_CODE (~(dma_addr_t)0x0) |
162 | 158 | ||
163 | static inline int pci_dma_mapping_error(dma_addr_t dma_addr) | 159 | static inline int pci_dma_mapping_error(dma_addr_t dma_addr) |
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h index 47cea16e1bad..202915d82759 100644 --- a/include/asm-sparc64/pci.h +++ b/include/asm-sparc64/pci.h | |||
@@ -303,10 +303,6 @@ pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | |||
303 | 303 | ||
304 | extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *); | 304 | extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *); |
305 | 305 | ||
306 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
307 | { | ||
308 | } | ||
309 | |||
310 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | 306 | static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) |
311 | { | 307 | { |
312 | return PCI_IRQ_NONE; | 308 | return PCI_IRQ_NONE; |
diff --git a/include/asm-v850/pci.h b/include/asm-v850/pci.h index 4581826e1cac..de2a7d0a81cc 100644 --- a/include/asm-v850/pci.h +++ b/include/asm-v850/pci.h | |||
@@ -116,8 +116,4 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
116 | extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); | 116 | extern void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); |
117 | extern void pci_iounmap (struct pci_dev *dev, void __iomem *addr); | 117 | extern void pci_iounmap (struct pci_dev *dev, void __iomem *addr); |
118 | 118 | ||
119 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
120 | { | ||
121 | } | ||
122 | |||
123 | #endif /* __V850_PCI_H__ */ | 119 | #endif /* __V850_PCI_H__ */ |
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index 49c5e9280598..d95c9e78fe1d 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h | |||
@@ -135,10 +135,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
135 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | 135 | extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, |
136 | enum pci_mmap_state mmap_state, int write_combine); | 136 | enum pci_mmap_state mmap_state, int write_combine); |
137 | 137 | ||
138 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
139 | { | ||
140 | } | ||
141 | |||
142 | #endif /* __KERNEL__ */ | 138 | #endif /* __KERNEL__ */ |
143 | 139 | ||
144 | /* generic pci stuff */ | 140 | /* generic pci stuff */ |
diff --git a/include/asm-xtensa/pci.h b/include/asm-xtensa/pci.h index 24eb7fc25da8..644411c8e0ca 100644 --- a/include/asm-xtensa/pci.h +++ b/include/asm-xtensa/pci.h | |||
@@ -74,10 +74,6 @@ int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma, | |||
74 | /* Tell drivers/pci/proc.c that we have pci_mmap_page_range() */ | 74 | /* Tell drivers/pci/proc.c that we have pci_mmap_page_range() */ |
75 | #define HAVE_PCI_MMAP 1 | 75 | #define HAVE_PCI_MMAP 1 |
76 | 76 | ||
77 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | ||
78 | { | ||
79 | } | ||
80 | |||
81 | #endif /* __KERNEL__ */ | 77 | #endif /* __KERNEL__ */ |
82 | 78 | ||
83 | /* Implement the pci_ DMA API in terms of the generic device dma_ one */ | 79 | /* Implement the pci_ DMA API in terms of the generic device dma_ one */ |
diff --git a/include/linux/pci.h b/include/linux/pci.h index ac403d74a222..18319aba1a57 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -881,5 +881,7 @@ extern int pci_pci_problems; | |||
881 | extern unsigned long pci_cardbus_io_size; | 881 | extern unsigned long pci_cardbus_io_size; |
882 | extern unsigned long pci_cardbus_mem_size; | 882 | extern unsigned long pci_cardbus_mem_size; |
883 | 883 | ||
884 | extern void pcibios_add_platform_entries(struct pci_dev *dev); | ||
885 | |||
884 | #endif /* __KERNEL__ */ | 886 | #endif /* __KERNEL__ */ |
885 | #endif /* LINUX_PCI_H */ | 887 | #endif /* LINUX_PCI_H */ |