diff options
Diffstat (limited to 'arch/tile/kernel/pci.c')
-rw-r--r-- | arch/tile/kernel/pci.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index aac1cd586966..67237d34c2e2 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c | |||
@@ -81,7 +81,7 @@ EXPORT_SYMBOL(pcibios_align_resource); | |||
81 | * controller_id is the controller number, config type is 0 or 1 for | 81 | * controller_id is the controller number, config type is 0 or 1 for |
82 | * config0 or config1 operations. | 82 | * config0 or config1 operations. |
83 | */ | 83 | */ |
84 | static int __devinit tile_pcie_open(int controller_id, int config_type) | 84 | static int tile_pcie_open(int controller_id, int config_type) |
85 | { | 85 | { |
86 | char filename[32]; | 86 | char filename[32]; |
87 | int fd; | 87 | int fd; |
@@ -97,8 +97,7 @@ static int __devinit tile_pcie_open(int controller_id, int config_type) | |||
97 | /* | 97 | /* |
98 | * Get the IRQ numbers from the HV and set up the handlers for them. | 98 | * Get the IRQ numbers from the HV and set up the handlers for them. |
99 | */ | 99 | */ |
100 | static int __devinit tile_init_irqs(int controller_id, | 100 | static int tile_init_irqs(int controller_id, struct pci_controller *controller) |
101 | struct pci_controller *controller) | ||
102 | { | 101 | { |
103 | char filename[32]; | 102 | char filename[32]; |
104 | int fd; | 103 | int fd; |
@@ -237,7 +236,7 @@ static int tile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | |||
237 | } | 236 | } |
238 | 237 | ||
239 | 238 | ||
240 | static void __devinit fixup_read_and_payload_sizes(void) | 239 | static void fixup_read_and_payload_sizes(void) |
241 | { | 240 | { |
242 | struct pci_dev *dev = NULL; | 241 | struct pci_dev *dev = NULL; |
243 | int smallest_max_payload = 0x1; /* Tile maxes out at 256 bytes. */ | 242 | int smallest_max_payload = 0x1; /* Tile maxes out at 256 bytes. */ |
@@ -379,7 +378,7 @@ subsys_initcall(pcibios_init); | |||
379 | /* | 378 | /* |
380 | * No bus fixups needed. | 379 | * No bus fixups needed. |
381 | */ | 380 | */ |
382 | void __devinit pcibios_fixup_bus(struct pci_bus *bus) | 381 | void pcibios_fixup_bus(struct pci_bus *bus) |
383 | { | 382 | { |
384 | /* Nothing needs to be done. */ | 383 | /* Nothing needs to be done. */ |
385 | } | 384 | } |
@@ -458,11 +457,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) | |||
458 | * specified bus & slot. | 457 | * specified bus & slot. |
459 | */ | 458 | */ |
460 | 459 | ||
461 | static int __devinit tile_cfg_read(struct pci_bus *bus, | 460 | static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset, |
462 | unsigned int devfn, | 461 | int size, u32 *val) |
463 | int offset, | ||
464 | int size, | ||
465 | u32 *val) | ||
466 | { | 462 | { |
467 | struct pci_controller *controller = bus->sysdata; | 463 | struct pci_controller *controller = bus->sysdata; |
468 | int busnum = bus->number & 0xff; | 464 | int busnum = bus->number & 0xff; |
@@ -504,11 +500,8 @@ static int __devinit tile_cfg_read(struct pci_bus *bus, | |||
504 | * See tile_cfg_read() for relevant comments. | 500 | * See tile_cfg_read() for relevant comments. |
505 | * Note that "val" is the value to write, not a pointer to that value. | 501 | * Note that "val" is the value to write, not a pointer to that value. |
506 | */ | 502 | */ |
507 | static int __devinit tile_cfg_write(struct pci_bus *bus, | 503 | static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset, |
508 | unsigned int devfn, | 504 | int size, u32 val) |
509 | int offset, | ||
510 | int size, | ||
511 | u32 val) | ||
512 | { | 505 | { |
513 | struct pci_controller *controller = bus->sysdata; | 506 | struct pci_controller *controller = bus->sysdata; |
514 | int busnum = bus->number & 0xff; | 507 | int busnum = bus->number & 0xff; |