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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (85 commits)
  [SCSI] 53c700: remove reliance on deprecated cmnd fields
  [SCSI] hptiop: don't use cmnd->bufflen
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  [SCSI] aacraid: small misc. cleanups
  [SCSI] aacraid: Update supported product information
  [SCSI] aacraid: Fix return code interpretation
  [SCSI] scsi_transport_sas: fix panic in sas_free_rphy
  [SCSI] remove RQ_SCSI_* flags
  [SCSI] remove scsi_request infrastructure
  [SCSI] mptfusion: change driver revision to 3.03.10
  [SCSI] mptfc: abort of board reset leaves port dead requiring reboot
  [SCSI] mptfc: fix fibre channel infinite request/response loop
  [SCSI] mptfc: set fibre channel fw target missing timers to one second
  [SCSI] mptfusion: move fc event/reset handling to mptfc
  [SCSI] spi transport: don't allow dt to be set on SE or HVD buses
  [SCSI] aic7xxx: expose the bus setting to sysfs
  [SCSI] scsi: remove Documentation/scsi/cpqfc.txt
  [SCSI] drivers/scsi: Use ARRAY_SIZE macro
  [SCSI] Remove last page_address from dc395x.c
  [SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
  ...

Fixed up conflicts in drivers/message/fusion/mptbase.c manually (due to
the sparc interrupt cleanups)

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index a53454908205..88d400fccc94 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -66,11 +66,11 @@ static irqreturn_t aac_sa_intr(int irq, void *dev_id, struct pt_regs *regs)
                         sa_writew(dev, DoorbellClrReg_p, PrintfReady); /* clear PrintfReady */
                         sa_writew(dev, DoorbellReg_s, PrintfDone);
                 } else if (intstat & DOORBELL_1) {      // dev -> Host Normal Command Ready
-                        aac_command_normal(&dev->queues->queue[HostNormCmdQueue]);
                         sa_writew(dev, DoorbellClrReg_p, DOORBELL_1);
+                        aac_command_normal(&dev->queues->queue[HostNormCmdQueue]);
                 } else if (intstat & DOORBELL_2) {      // dev -> Host Normal Response Ready
-                        aac_response_normal(&dev->queues->queue[HostNormRespQueue]);
                         sa_writew(dev, DoorbellClrReg_p, DOORBELL_2);
+                        aac_response_normal(&dev->queues->queue[HostNormRespQueue]);
                 } else if (intstat & DOORBELL_3) {      // dev -> Host Normal Command Not Full
                         sa_writew(dev, DoorbellClrReg_p, DOORBELL_3);
                 } else if (intstat & DOORBELL_4) {      // dev -> Host Normal Response Not Full
@@ -318,13 +318,13 @@ int aac_sa_init(struct aac_dev *dev)
          *      Wait for the adapter to be up and running. Wait up to 3 minutes.
          */
         while (!(sa_readl(dev, Mailbox7) & KERNEL_UP_AND_RUNNING)) {
-                if (time_after(jiffies, start+180*HZ)) {
+                if (time_after(jiffies, start+startup_timeout*HZ)) {
                         status = sa_readl(dev, Mailbox7);
                         printk(KERN_WARNING "%s%d: adapter kernel failed to start, init status = %lx.\n", 
                                         name, instance, status);
                         goto error_iounmap;
                 }
-                schedule_timeout_uninterruptible(1);
+                msleep(1);
         }
 
         if (request_irq(dev->scsi_host_ptr->irq, aac_sa_intr, SA_SHIRQ|SA_INTERRUPT, "aacraid", (void *)dev ) < 0) {