--- linux-2.5/drivers/scsi/qlogicfas.c 2003-10-15 17:16:15.000000000 -0200 +++ build-2.5/drivers/scsi/qlogicfas.c 2003-10-17 16:44:41.000000000 -0200 @@ -48,11 +48,6 @@ #define QL_INT_ACTIVE_HIGH 2 -/* Set the following to 1 to enable the use of interrupts. Note that 0 tends - to be more stable, but slower (or ties up the system more) */ - -#define QL_USE_IRQ 1 - /* Set the following to max out the speed of the PIO PseudoDMA transfers, again, 0 tends to be slower, but more stable. */ @@ -500,8 +495,6 @@ return (result << 16) | (message << 8) | (status & STATUS_MASK); } -#if QL_USE_IRQ - /* * Interrupt handler */ @@ -541,10 +534,6 @@ return IRQ_HANDLED; } -#endif - -#if QL_USE_IRQ - /* * Queued command */ @@ -566,12 +555,6 @@ ql_icmd(cmd); return 0; } -#else -int qlogicfas_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) -{ - return 1; -} -#endif #ifdef PCMCIA @@ -641,7 +624,6 @@ REG0; #endif -#if QL_USE_IRQ /* * IRQ probe - toggle pin and check request pending */ @@ -670,7 +652,7 @@ if (qlirq >= 0 && !request_irq(qlirq, do_ql_ihandl, 0, "qlogicfas", NULL)) host->can_queue = 1; -#endif + hreg = scsi_register(host, 0); /* no host data */ if (!hreg) goto err_release_mem;