aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-12-13 19:14:13 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-01-11 19:28:12 -0500
commit736f77deaf6b0bf51eaab1ea5d074adc11b8c7cd (patch)
treebe70097e65b8a139ca99364e64c4ee296e0c7078
parentbaa9aac6a15a1990e9d2d7a5648f53dfccc440ad (diff)
[SCSI] sym53c416: kill pointless irq handler loop and test
- kill pointless irq handler loop to find base address, it is already passed to irq handler via Scsi_Host. - kill now-pointless !base test. Signed-off-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/sym53c416.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/scsi/sym53c416.c b/drivers/scsi/sym53c416.c
index 90cee94d9522..1f6fd1680335 100644
--- a/drivers/scsi/sym53c416.c
+++ b/drivers/scsi/sym53c416.c
@@ -328,27 +328,13 @@ static __inline__ unsigned int sym53c416_write(int base, unsigned char *buffer,
328static irqreturn_t sym53c416_intr_handle(int irq, void *dev_id) 328static irqreturn_t sym53c416_intr_handle(int irq, void *dev_id)
329{ 329{
330 struct Scsi_Host *dev = dev_id; 330 struct Scsi_Host *dev = dev_id;
331 int base = 0; 331 int base = dev->io_port;
332 int i; 332 int i;
333 unsigned long flags = 0; 333 unsigned long flags = 0;
334 unsigned char status_reg, pio_int_reg, int_reg; 334 unsigned char status_reg, pio_int_reg, int_reg;
335 struct scatterlist *sg; 335 struct scatterlist *sg;
336 unsigned int tot_trans = 0; 336 unsigned int tot_trans = 0;
337 337
338 /* We search the base address of the host adapter which caused the interrupt */
339 /* FIXME: should pass dev_id sensibly as hosts[i] */
340 for(i = 0; i < host_index && !base; i++)
341 if(irq == hosts[i].irq)
342 base = hosts[i].base;
343 /* If no adapter found, we cannot handle the interrupt. Leave a message */
344 /* and continue. This should never happen... */
345 if(!base)
346 {
347 printk(KERN_ERR "sym53c416: No host adapter defined for interrupt %d\n", irq);
348 return IRQ_NONE;
349 }
350 /* Now we have the base address and we can start handling the interrupt */
351
352 spin_lock_irqsave(dev->host_lock,flags); 338 spin_lock_irqsave(dev->host_lock,flags);
353 status_reg = inb(base + STATUS_REG); 339 status_reg = inb(base + STATUS_REG);
354 pio_int_reg = inb(base + PIO_INT_REG); 340 pio_int_reg = inb(base + PIO_INT_REG);