diff options
author | Martyn Welch <martyn.welch@gefanuc.com> | 2009-10-29 12:35:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:23:18 -0500 |
commit | a4b02959d5bec1b3e3a3e266b196673a89e62c29 (patch) | |
tree | 738c7068c33d5cbf681f01e29ff70bec79edef9a /drivers/staging | |
parent | 8be9226c8f686c6dd2bae0a7ed4f5795e89d32d8 (diff) |
Staging: vme: Clean up tsi148 driver
* Remove message from IACK interrupt handler
* Correct clearing of location monitor interrupts
* Remove interrupt cleanup code that's duplcated in sub function
Signed-off-by: Martyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vme/bridges/vme_tsi148.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index 03eb48e4d8fd..89a7dccb934f 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c | |||
@@ -237,7 +237,6 @@ static u32 tsi148_VERR_irqhandler(void) | |||
237 | */ | 237 | */ |
238 | static u32 tsi148_IACK_irqhandler(void) | 238 | static u32 tsi148_IACK_irqhandler(void) |
239 | { | 239 | { |
240 | printk("tsi148_IACK_irqhandler\n"); | ||
241 | wake_up(&iack_queue); | 240 | wake_up(&iack_queue); |
242 | 241 | ||
243 | return TSI148_LCSR_INTC_IACKC; | 242 | return TSI148_LCSR_INTC_IACKC; |
@@ -2121,7 +2120,7 @@ int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor) | |||
2121 | iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO); | 2120 | iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO); |
2122 | 2121 | ||
2123 | iowrite32be(TSI148_LCSR_INTC_LMC[monitor], | 2122 | iowrite32be(TSI148_LCSR_INTC_LMC[monitor], |
2124 | tsi148_bridge->base + TSI148_LCSR_INTEO); | 2123 | tsi148_bridge->base + TSI148_LCSR_INTC); |
2125 | 2124 | ||
2126 | /* Detach callback */ | 2125 | /* Detach callback */ |
2127 | lm_callback[monitor] = NULL; | 2126 | lm_callback[monitor] = NULL; |
@@ -2582,13 +2581,6 @@ static void tsi148_remove(struct pci_dev *pdev) | |||
2582 | } | 2581 | } |
2583 | 2582 | ||
2584 | /* | 2583 | /* |
2585 | * Disable and clear all interrupts. | ||
2586 | */ | ||
2587 | iowrite32be(0x0, tsi148_bridge->base + TSI148_LCSR_INTEO); | ||
2588 | iowrite32be(0xFFFFFFFF, tsi148_bridge->base + TSI148_LCSR_INTC); | ||
2589 | iowrite32be(0xFFFFFFFF, tsi148_bridge->base + TSI148_LCSR_INTEN); | ||
2590 | |||
2591 | /* | ||
2592 | * Map all Interrupts to PCI INTA | 2584 | * Map all Interrupts to PCI INTA |
2593 | */ | 2585 | */ |
2594 | iowrite32be(0x0, tsi148_bridge->base + TSI148_LCSR_INTM1); | 2586 | iowrite32be(0x0, tsi148_bridge->base + TSI148_LCSR_INTM1); |