X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fmedia%2Fdvb%2Fmantis%2Fmantis_hif.c;h=73e5ca0c6c142c297a7e7741730b1f93d41fa8be;hb=0bdc799b8b82cf61c86604291c53998febc96403;hp=bb05427fdeb6d1b738bd474c7d47dc85c870b8af;hpb=5dd83a35bea908ebb8243d67d8c251eed2bb5cc8;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index bb05427..73e5ca0 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -22,7 +22,6 @@
 #include <linux/signal.h>
 #include <linux/sched.h>
 
-#include <asm/irq.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
@@ -40,22 +39,6 @@
 
 #include "mantis_reg.h"
 
-static int mantis_hif_data_available(struct mantis_ca *ca)
-{
-	struct mantis_pci *mantis = ca->ca_priv;
-	int rc = 0;
-
-	if (wait_event_interruptible_timeout(ca->hif_data_wq,
-					     ca->sbuf_status & MANTIS_SBUF_DATA_AVAIL,
-					     msecs_to_jiffies(500)) == -ERESTARTSYS) {
-
-		dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): HIF Read wait event timeout !", mantis->num);
-		rc = -EREMOTEIO;
-	}
-	ca->sbuf_status &= ~MANTIS_SBUF_DATA_AVAIL;
-	udelay(2);
-	return rc;
-}
 
 static int mantis_hif_sbuf_opdone_wait(struct mantis_ca *ca)
 {