diff options
Diffstat (limited to 'arch/ia64/pci/pci.c')
-rw-r--r-- | arch/ia64/pci/pci.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 5faa66c5c2a8..55b72ad57329 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -116,8 +116,7 @@ struct pci_ops pci_root_ops = { | |||
116 | 116 | ||
117 | /* Called by ACPI when it finds a new root bus. */ | 117 | /* Called by ACPI when it finds a new root bus. */ |
118 | 118 | ||
119 | static struct pci_controller * __devinit | 119 | static struct pci_controller *alloc_pci_controller(int seg) |
120 | alloc_pci_controller (int seg) | ||
121 | { | 120 | { |
122 | struct pci_controller *controller; | 121 | struct pci_controller *controller; |
123 | 122 | ||
@@ -165,8 +164,8 @@ new_space (u64 phys_base, int sparse) | |||
165 | return i; | 164 | return i; |
166 | } | 165 | } |
167 | 166 | ||
168 | static u64 __devinit | 167 | static u64 add_io_space(struct pci_root_info *info, |
169 | add_io_space (struct pci_root_info *info, struct acpi_resource_address64 *addr) | 168 | struct acpi_resource_address64 *addr) |
170 | { | 169 | { |
171 | struct resource *resource; | 170 | struct resource *resource; |
172 | char *name; | 171 | char *name; |
@@ -226,8 +225,8 @@ out: | |||
226 | return ~0; | 225 | return ~0; |
227 | } | 226 | } |
228 | 227 | ||
229 | static acpi_status __devinit resource_to_window(struct acpi_resource *resource, | 228 | static acpi_status resource_to_window(struct acpi_resource *resource, |
230 | struct acpi_resource_address64 *addr) | 229 | struct acpi_resource_address64 *addr) |
231 | { | 230 | { |
232 | acpi_status status; | 231 | acpi_status status; |
233 | 232 | ||
@@ -249,8 +248,7 @@ static acpi_status __devinit resource_to_window(struct acpi_resource *resource, | |||
249 | return AE_ERROR; | 248 | return AE_ERROR; |
250 | } | 249 | } |
251 | 250 | ||
252 | static acpi_status __devinit | 251 | static acpi_status count_window(struct acpi_resource *resource, void *data) |
253 | count_window (struct acpi_resource *resource, void *data) | ||
254 | { | 252 | { |
255 | unsigned int *windows = (unsigned int *) data; | 253 | unsigned int *windows = (unsigned int *) data; |
256 | struct acpi_resource_address64 addr; | 254 | struct acpi_resource_address64 addr; |
@@ -263,7 +261,7 @@ count_window (struct acpi_resource *resource, void *data) | |||
263 | return AE_OK; | 261 | return AE_OK; |
264 | } | 262 | } |
265 | 263 | ||
266 | static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | 264 | static acpi_status add_window(struct acpi_resource *res, void *data) |
267 | { | 265 | { |
268 | struct pci_root_info *info = data; | 266 | struct pci_root_info *info = data; |
269 | struct pci_window *window; | 267 | struct pci_window *window; |
@@ -324,8 +322,7 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | |||
324 | return AE_OK; | 322 | return AE_OK; |
325 | } | 323 | } |
326 | 324 | ||
327 | struct pci_bus * __devinit | 325 | struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) |
328 | pci_acpi_scan_root(struct acpi_pci_root *root) | ||
329 | { | 326 | { |
330 | struct acpi_device *device = root->device; | 327 | struct acpi_device *device = root->device; |
331 | int domain = root->segment; | 328 | int domain = root->segment; |
@@ -396,7 +393,7 @@ out1: | |||
396 | return NULL; | 393 | return NULL; |
397 | } | 394 | } |
398 | 395 | ||
399 | static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | 396 | static int is_valid_resource(struct pci_dev *dev, int idx) |
400 | { | 397 | { |
401 | unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; | 398 | unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM; |
402 | struct resource *devr = &dev->resource[idx], *busr; | 399 | struct resource *devr = &dev->resource[idx], *busr; |
@@ -414,8 +411,7 @@ static int __devinit is_valid_resource(struct pci_dev *dev, int idx) | |||
414 | return 0; | 411 | return 0; |
415 | } | 412 | } |
416 | 413 | ||
417 | static void __devinit | 414 | static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit) |
418 | pcibios_fixup_resources(struct pci_dev *dev, int start, int limit) | ||
419 | { | 415 | { |
420 | int i; | 416 | int i; |
421 | 417 | ||
@@ -427,13 +423,13 @@ pcibios_fixup_resources(struct pci_dev *dev, int start, int limit) | |||
427 | } | 423 | } |
428 | } | 424 | } |
429 | 425 | ||
430 | void __devinit pcibios_fixup_device_resources(struct pci_dev *dev) | 426 | void pcibios_fixup_device_resources(struct pci_dev *dev) |
431 | { | 427 | { |
432 | pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES); | 428 | pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES); |
433 | } | 429 | } |
434 | EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources); | 430 | EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources); |
435 | 431 | ||
436 | static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev) | 432 | static void pcibios_fixup_bridge_resources(struct pci_dev *dev) |
437 | { | 433 | { |
438 | pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES); | 434 | pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES); |
439 | } | 435 | } |
@@ -441,8 +437,7 @@ static void __devinit pcibios_fixup_bridge_resources(struct pci_dev *dev) | |||
441 | /* | 437 | /* |
442 | * Called after each bus is probed, but before its children are examined. | 438 | * Called after each bus is probed, but before its children are examined. |
443 | */ | 439 | */ |
444 | void __devinit | 440 | void pcibios_fixup_bus(struct pci_bus *b) |
445 | pcibios_fixup_bus (struct pci_bus *b) | ||
446 | { | 441 | { |
447 | struct pci_dev *dev; | 442 | struct pci_dev *dev; |
448 | 443 | ||