diff options
Diffstat (limited to 'arch/mips/pci/ops-pmcmsp.c')
| -rw-r--r-- | arch/mips/pci/ops-pmcmsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c index b7c03d80c88c..8fbfbf2b931c 100644 --- a/arch/mips/pci/ops-pmcmsp.c +++ b/arch/mips/pci/ops-pmcmsp.c | |||
| @@ -308,7 +308,7 @@ static struct resource pci_mem_resource = { | |||
| 308 | * RETURNS: PCIBIOS_SUCCESSFUL - success | 308 | * RETURNS: PCIBIOS_SUCCESSFUL - success |
| 309 | * | 309 | * |
| 310 | ****************************************************************************/ | 310 | ****************************************************************************/ |
| 311 | static int bpci_interrupt(int irq, void *dev_id) | 311 | static irqreturn_t bpci_interrupt(int irq, void *dev_id) |
| 312 | { | 312 | { |
| 313 | struct msp_pci_regs *preg = (void *)PCI_BASE_REG; | 313 | struct msp_pci_regs *preg = (void *)PCI_BASE_REG; |
| 314 | unsigned int stat = preg->if_status; | 314 | unsigned int stat = preg->if_status; |
| @@ -326,7 +326,7 @@ static int bpci_interrupt(int irq, void *dev_id) | |||
| 326 | /* write to clear all asserted interrupts */ | 326 | /* write to clear all asserted interrupts */ |
| 327 | preg->if_status = stat; | 327 | preg->if_status = stat; |
| 328 | 328 | ||
| 329 | return PCIBIOS_SUCCESSFUL; | 329 | return IRQ_HANDLED; |
| 330 | } | 330 | } |
| 331 | 331 | ||
| 332 | /***************************************************************************** | 332 | /***************************************************************************** |
| @@ -344,7 +344,7 @@ static int bpci_interrupt(int irq, void *dev_id) | |||
| 344 | * PCI_ACCESS_WRITE and PCI_ACCESS_READ. | 344 | * PCI_ACCESS_WRITE and PCI_ACCESS_READ. |
| 345 | * | 345 | * |
| 346 | * bus - pointer to the bus number of the device to | 346 | * bus - pointer to the bus number of the device to |
| 347 | * be targetted for the configuration cycle. | 347 | * be targeted for the configuration cycle. |
| 348 | * The only element of the pci_bus structure | 348 | * The only element of the pci_bus structure |
| 349 | * used is bus->number. This argument determines | 349 | * used is bus->number. This argument determines |
| 350 | * if the configuration access will be Type 0 or | 350 | * if the configuration access will be Type 0 or |
| @@ -354,7 +354,7 @@ static int bpci_interrupt(int irq, void *dev_id) | |||
| 354 | * | 354 | * |
| 355 | * devfn - this is an 8-bit field. The lower three bits | 355 | * devfn - this is an 8-bit field. The lower three bits |
| 356 | * specify the function number of the device to | 356 | * specify the function number of the device to |
| 357 | * be targetted for the configuration cycle, with | 357 | * be targeted for the configuration cycle, with |
| 358 | * all three-bit combinations being legal. The | 358 | * all three-bit combinations being legal. The |
| 359 | * upper five bits specify the device number, | 359 | * upper five bits specify the device number, |
| 360 | * with legal values being 10 to 31. | 360 | * with legal values being 10 to 31. |
