Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

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,
 static irqreturn_t sym53c416_intr_handle(int irq, void *dev_id)
 {
         struct Scsi_Host *dev = dev_id;
-        int base = 0;
+        int base = dev->io_port;
         int i;
         unsigned long flags = 0;
         unsigned char status_reg, pio_int_reg, int_reg;
         struct scatterlist *sg;
         unsigned int tot_trans = 0;
 
-        /* We search the base address of the host adapter which caused the interrupt */
-        /* FIXME: should pass dev_id sensibly as hosts[i] */
-        for(i = 0; i < host_index && !base; i++)
-                if(irq == hosts[i].irq)
-                        base = hosts[i].base;
-        /* If no adapter found, we cannot handle the interrupt. Leave a message */
-        /* and continue. This should never happen...                            */
-        if(!base)
-        {
-                printk(KERN_ERR "sym53c416: No host adapter defined for interrupt %d\n", irq);
-                return IRQ_NONE;
-        }
-        /* Now we have the base address and we can start handling the interrupt */
-
         spin_lock_irqsave(dev->host_lock,flags);
         status_reg = inb(base + STATUS_REG);
         pio_int_reg = inb(base + PIO_INT_REG);