aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartyn Welch <martyn.welch@gefanuc.com>2009-10-29 16:35:14 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:18 -0800
commita4b02959d5bec1b3e3a3e266b196673a89e62c29 (patch)
tree738c7068c33d5cbf681f01e29ff70bec79edef9a
parent8be9226c8f686c6dd2bae0a7ed4f5795e89d32d8 (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>
-rw-r--r--drivers/staging/vme/bridges/vme_tsi148.c10
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 03eb48e4d8f..89a7dccb934 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)
*/
static u32 tsi148_IACK_irqhandler(void)
{
- printk("tsi148_IACK_irqhandler\n");
wake_up(&iack_queue);
return TSI148_LCSR_INTC_IACKC;
@@ -2121,7 +2120,7 @@ int tsi148_lm_detach(struct vme_lm_resource *lm, int monitor)
iowrite32be(tmp, tsi148_bridge->base + TSI148_LCSR_INTEO);
iowrite32be(TSI148_LCSR_INTC_LMC[monitor],
- tsi148_bridge->base + TSI148_LCSR_INTEO);
+ tsi148_bridge->base + TSI148_LCSR_INTC);
/* Detach callback */
lm_callback[monitor] = NULL;
@@ -2582,13 +2581,6 @@ static void tsi148_remove(struct pci_dev *pdev)
}
/*
- * Disable and clear all interrupts.
- */
- iowrite32be(0x0, tsi148_bridge->base + TSI148_LCSR_INTEO);
- iowrite32be(0xFFFFFFFF, tsi148_bridge->base + TSI148_LCSR_INTC);
- iowrite32be(0xFFFFFFFF, tsi148_bridge->base + TSI148_LCSR_INTEN);
-
- /*
* Map all Interrupts to PCI INTA
*/
iowrite32be(0x0, tsi148_bridge->base + TSI148_LCSR_INTM1);