19 files changed, 110 insertions, 157 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index ed0ca1508027..9d2119b53ac9 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -65,6 +65,7 @@ config BLK_DEV_SD
         depends on SCSI
         ---help---
           If you want to use SCSI hard disks, Fibre Channel disks,
+          Serial ATA (SATA) or Parallel ATA (PATA) hard disks,
           USB storage or the SCSI or parallel port version of
           the IOMEGA ZIP drive, say Y and read the SCSI-HOWTO,
           the Disk-HOWTO and the Multi-Disk-HOWTO, available from
@@ -1542,6 +1543,7 @@ source "drivers/scsi/arm/Kconfig"
 config JAZZ_ESP
         bool "MIPS JAZZ FAS216 SCSI support"
         depends on MACH_JAZZ && SCSI
+        select SCSI_SPI_ATTRS
         help
           This is the driver for the onboard SCSI host adapter of MIPS Magnum
           4000, Acer PICA, Olivetti M700-10 and a few other identical OEM
@@ -1766,6 +1768,7 @@ config SUN3X_ESP
 config SCSI_SUNESP
         tristate "Sparc ESP Scsi Driver"
         depends on SBUS && SCSI
+        select SCSI_SPI_ATTRS
         help
           This is the driver for the Sun ESP SCSI host adapter. The ESP
           chipset is present in most SPARC SBUS-based computers.
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 37de6b37b084..f8e449a98d29 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2627,7 +2627,7 @@ static void NCR5380_reselect(struct Scsi_Host *instance) {
 #ifdef REAL_DMA
 static void NCR5380_dma_complete(NCR5380_instance * instance) {
         NCR5380_local_declare();
-        struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata * instance->hostdata);
+        struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
         int transferred;
         NCR5380_setup(instance);
 
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 4fda01e97f46..d76e1a8cb93a 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -943,6 +943,14 @@ static struct scsi_host_template aac_driver_template = {
         .emulated                       = 1,
 };
 
+static void __aac_shutdown(struct aac_dev * aac)
+{
+        kthread_stop(aac->thread);
+        aac_send_shutdown(aac);
+        aac_adapter_disable_int(aac);
+        free_irq(aac->pdev->irq, aac);
+}
+
 static int __devinit aac_probe_one(struct pci_dev *pdev,
                 const struct pci_device_id *id)
 {
@@ -1095,10 +1103,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
         return 0;
 
  out_deinit:
-        kthread_stop(aac->thread);
-        aac_send_shutdown(aac);
-        aac_adapter_disable_int(aac);
-        free_irq(pdev->irq, aac);
+        __aac_shutdown(aac);
  out_unmap:
         aac_fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);
@@ -1118,7 +1123,8 @@ static void aac_shutdown(struct pci_dev *dev)
 {
         struct Scsi_Host *shost = pci_get_drvdata(dev);
         struct aac_dev *aac = (struct aac_dev *)shost->hostdata;
-        aac_send_shutdown(aac);
+        scsi_block_requests(shost);
+        __aac_shutdown(aac);
 }
 
 static void __devexit aac_remove_one(struct pci_dev *pdev)
@@ -1128,16 +1134,12 @@ static void __devexit aac_remove_one(struct pci_dev *pdev)
 
         scsi_remove_host(shost);
 
-        kthread_stop(aac->thread);
-
-        aac_send_shutdown(aac);
-        aac_adapter_disable_int(aac);
+        __aac_shutdown(aac);
         aac_fib_map_free(aac);
         pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,
                         aac->comm_phys);
         kfree(aac->queues);
 
-        free_irq(pdev->irq, aac);
         aac_adapter_ioremap(aac, 0);
         
         kfree(aac->fibs);
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 9ddc6e4a74b0..05f692bd0adc 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -5180,7 +5180,7 @@ ahd_handle_devreset(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
                         cur_lun = lun;
                         max_lun = lun;
                 }
-                for (cur_lun <= max_lun; cur_lun++) {
+                for (;cur_lun <= max_lun; cur_lun++) {
                         struct ahd_tmode_lstate* lstate;
 
                         lstate = tstate->enabled_luns[cur_lun];
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index 27852b43b904..1c0d7578e791 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -223,13 +223,8 @@ static int __devinit asd_common_setup(struct asd_ha_struct *asd_ha)
 {
         int err, i;
 
-        err = pci_read_config_byte(asd_ha->pcidev, PCI_REVISION_ID,
-                                   &asd_ha->revision_id);
-        if (err) {
-                asd_printk("couldn't read REVISION ID register of %s\n",
-                           pci_name(asd_ha->pcidev));
-                goto Err;
-        }
+        asd_ha->revision_id = asd_ha->pcidev->revision;
+
         err = -ENODEV;
         if (asd_ha->revision_id < AIC9410_DEV_REV_B0) {
                 asd_printk("%s is revision %s (%X), which is not supported\n",
diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr_attr.c
index 03bfed61bffc..06c0dce3b839 100644
--- a/drivers/scsi/arcmsr/arcmsr_attr.c
+++ b/drivers/scsi/arcmsr/arcmsr_attr.c
@@ -59,8 +59,9 @@
 struct class_device_attribute *arcmsr_host_attrs[];
 
 static ssize_t
-arcmsr_sysfs_iop_message_read(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+arcmsr_sysfs_iop_message_read(struct kobject *kobj,
+                              struct bin_attribute *bin_attr,
+                              char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *host = class_to_shost(cdev);
@@ -105,8 +106,9 @@ arcmsr_sysfs_iop_message_read(struct kobject *kobj, char *buf, loff_t off,
 }
 
 static ssize_t
-arcmsr_sysfs_iop_message_write(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+arcmsr_sysfs_iop_message_write(struct kobject *kobj,
+                               struct bin_attribute *bin_attr,
+                               char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *host = class_to_shost(cdev);
@@ -152,8 +154,9 @@ arcmsr_sysfs_iop_message_write(struct kobject *kobj, char *buf, loff_t off,
 }
 
 static ssize_t
-arcmsr_sysfs_iop_message_clear(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+arcmsr_sysfs_iop_message_clear(struct kobject *kobj,
+                               struct bin_attribute *bin_attr,
+                               char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *host = class_to_shost(cdev);
@@ -188,7 +191,6 @@ static struct bin_attribute arcmsr_sysfs_message_read_attr = {
         .attr = {
                 .name = "mu_read",
                 .mode = S_IRUSR ,
-                .owner = THIS_MODULE,
         },
         .size = 1032,
         .read = arcmsr_sysfs_iop_message_read,
@@ -198,7 +200,6 @@ static struct bin_attribute arcmsr_sysfs_message_write_attr = {
         .attr = {
                 .name = "mu_write",
                 .mode = S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 1032,
         .write = arcmsr_sysfs_iop_message_write,
@@ -208,7 +209,6 @@ static struct bin_attribute arcmsr_sysfs_message_clear_attr = {
         .attr = {
                 .name = "mu_clear",
                 .mode = S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 1,
         .write = arcmsr_sysfs_iop_message_clear,
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index eff846ae0aff..03dbe60c264a 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -894,45 +894,6 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)
 }
 
 /*
- * our own old-style timeout update
- */
-/*
- * The strategy is to cause the timer code to call scsi_times_out()
- * when the soonest timeout is pending.
- * The arguments are used when we are queueing a new command, because
- * we do not want to subtract the time used from this time, but when we
- * set the timer, we want to take this value into account.
- */
-
-int atari_scsi_update_timeout(Scsi_Cmnd * SCset, int timeout)
-{
-        int rtn;
-
-        /*
-         * We are using the new error handling code to actually register/deregister
-         * timers for timeout.
-         */
-
-        if (!timer_pending(&SCset->eh_timeout))
-                rtn = 0;
-        else
-                rtn = SCset->eh_timeout.expires - jiffies;
-
-        if (timeout == 0) {
-                del_timer(&SCset->eh_timeout);
-                SCset->eh_timeout.data = (unsigned long)NULL;
-                SCset->eh_timeout.expires = 0;
-        } else {
-                if (SCset->eh_timeout.data != (unsigned long)NULL)
-                        del_timer(&SCset->eh_timeout);
-                SCset->eh_timeout.data = (unsigned long)SCset;
-                SCset->eh_timeout.expires = jiffies + timeout;
-                add_timer(&SCset->eh_timeout);
-        }
-        return rtn;
-}
-
-/*
  * Function : int NCR5380_queue_command (Scsi_Cmnd *cmd,
  *      void (*done)(Scsi_Cmnd *))
  *
@@ -956,7 +917,6 @@ static int NCR5380_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
         Scsi_Cmnd *tmp;
         int oldto;
         unsigned long flags;
-        // extern int update_timeout(Scsi_Cmnd * SCset, int timeout);
 
 #if (NDEBUG & NDEBUG_NO_WRITE)
         switch (cmd->cmnd[0]) {
@@ -1029,9 +989,9 @@ static int NCR5380_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
          * alter queues and touch the lock.
          */
         if (!IS_A_TT()) {
-                oldto = atari_scsi_update_timeout(cmd, 0);
+                /* perhaps stop command timer here */
                 falcon_get_lock();
-                atari_scsi_update_timeout(cmd, oldto);
+                /* perhaps restart command timer here */
         }
         if (!(hostdata->issue_queue) || (cmd->cmnd[0] == REQUEST_SENSE)) {
                 LIST(cmd, hostdata->issue_queue);
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index c1d50e669c43..77b06a983fa7 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2029,6 +2029,7 @@ static void esp_reset_cleanup(struct esp *esp)
                         starget_for_each_device(tp->starget, NULL,
                                                 esp_clear_hold);
         }
+        esp->flags &= ~ESP_FLAG_RESETTING;
 }
 
 /* Runs under host->lock */
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 8263f752809d..bb90df8bdce4 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -463,7 +463,7 @@ static inline unsigned long get_timeout(idescsi_pc_t *pc)
 
 static int idescsi_expiry(ide_drive_t *drive)
 {
-        idescsi_scsi_t *scsi = drive->driver_data;
+        idescsi_scsi_t *scsi = drive_to_idescsi(drive);
         idescsi_pc_t   *pc   = scsi->pc;
 
 #if IDESCSI_DEBUG_LOG
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 072f57715658..f142eafb6fc7 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -2439,6 +2439,7 @@ restart:
 /**
  * ipr_read_trace - Dump the adapter trace
  * @kobj:               kobject struct
+ * @bin_attr:           bin_attribute struct
  * @buf:                buffer
  * @off:                offset
  * @count:              buffer size
@@ -2446,8 +2447,9 @@ restart:
  * Return value:
  *      number of bytes printed to buffer
  **/
-static ssize_t ipr_read_trace(struct kobject *kobj, char *buf,
-                              loff_t off, size_t count)
+static ssize_t ipr_read_trace(struct kobject *kobj,
+                              struct bin_attribute *bin_attr,
+                              char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *shost = class_to_shost(cdev);
@@ -3140,6 +3142,7 @@ static struct class_device_attribute *ipr_ioa_attrs[] = {
 /**
  * ipr_read_dump - Dump the adapter
  * @kobj:               kobject struct
+ * @bin_attr:           bin_attribute struct
  * @buf:                buffer
  * @off:                offset
  * @count:              buffer size
@@ -3147,8 +3150,9 @@ static struct class_device_attribute *ipr_ioa_attrs[] = {
  * Return value:
  *      number of bytes printed to buffer
  **/
-static ssize_t ipr_read_dump(struct kobject *kobj, char *buf,
-                              loff_t off, size_t count)
+static ssize_t ipr_read_dump(struct kobject *kobj,
+                             struct bin_attribute *bin_attr,
+                             char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *shost = class_to_shost(cdev);
@@ -3301,6 +3305,7 @@ static int ipr_free_dump(struct ipr_ioa_cfg *ioa_cfg)
 /**
  * ipr_write_dump - Setup dump state of adapter
  * @kobj:               kobject struct
+ * @bin_attr:           bin_attribute struct
  * @buf:                buffer
  * @off:                offset
  * @count:              buffer size
@@ -3308,8 +3313,9 @@ static int ipr_free_dump(struct ipr_ioa_cfg *ioa_cfg)
  * Return value:
  *      number of bytes printed to buffer
  **/
-static ssize_t ipr_write_dump(struct kobject *kobj, char *buf,
-                              loff_t off, size_t count)
+static ssize_t ipr_write_dump(struct kobject *kobj,
+                              struct bin_attribute *bin_attr,
+                              char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj,struct class_device,kobj);
         struct Scsi_Host *shost = class_to_shost(cdev);
@@ -5303,18 +5309,12 @@ static const u16 ipr_blocked_processors[] = {
  **/
 static int ipr_invalid_adapter(struct ipr_ioa_cfg *ioa_cfg)
 {
-        u8 rev_id;
         int i;
 
-        if (ioa_cfg->type == 0x5702) {
-                if (pci_read_config_byte(ioa_cfg->pdev, PCI_REVISION_ID,
-                                         &rev_id) == PCIBIOS_SUCCESSFUL) {
-                        if (rev_id < 4) {
-                                for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
-                                        if (__is_processor(ipr_blocked_processors[i]))
-                                                return 1;
-                                }
-                        }
+        if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
+                for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
+                        if (__is_processor(ipr_blocked_processors[i]))
+                                return 1;
                 }
         }
         return 0;
@@ -7471,13 +7471,7 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
         else
                 ioa_cfg->transop_timeout = IPR_OPERATIONAL_TIMEOUT;
 
-        rc = pci_read_config_byte(pdev, PCI_REVISION_ID, &ioa_cfg->revid);
-
-        if (rc != PCIBIOS_SUCCESSFUL) {
-                dev_err(&pdev->dev, "Failed to read PCI revision ID\n");
-                rc = -EIO;
-                goto out_scsi_host_put;
-        }
+        ioa_cfg->revid = pdev->revision;
 
         ipr_regs_pci = pci_resource_start(pdev, 0);
 
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index f9fce70f396a..9f8ed6b81576 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -6987,7 +6987,6 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
         uint32_t mem_addr;
         uint32_t io_len;
         uint32_t mem_len;
-        uint8_t revision_id;
         uint8_t bus;
         uint8_t func;
         uint8_t irq;
@@ -7066,12 +7065,6 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
                 }
         }
 
-        /* get the revision ID */
-        if (pci_read_config_byte(pci_dev, PCI_REVISION_ID, &revision_id)) {
-                IPS_PRINTK(KERN_WARNING, pci_dev, "Can't get revision id.\n");
-                return -1;
-        }
-
         subdevice_id = pci_dev->subsystem_device;
 
         /* found a controller */
@@ -7097,7 +7090,7 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr)
         ha->mem_ptr = mem_ptr;
         ha->ioremap_ptr = ioremap_ptr;
         ha->host_num = (uint32_t) index;
-        ha->revision_id = revision_id;
+        ha->revision_id = pci_dev->revision;
         ha->slot_num = PCI_SLOT(pci_dev->devfn);
         ha->device_id = pci_dev->device;
         ha->subdevice_id = subdevice_id;
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index e34442e405e8..23e90c5f8f35 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -38,8 +38,10 @@ static int sas_disable_routing(struct domain_device *dev,  u8 *sas_addr);
 
 #if 0
 /* FIXME: smp needs to migrate into the sas class */
-static ssize_t smp_portal_read(struct kobject *, char *, loff_t, size_t);
-static ssize_t smp_portal_write(struct kobject *, char *, loff_t, size_t);
+static ssize_t smp_portal_read(struct kobject *, struct bin_attribute *,
+                               char *, loff_t, size_t);
+static ssize_t smp_portal_write(struct kobject *, struct bin_attribute *,
+                                char *, loff_t, size_t);
 #endif
 
 /* ---------- SMP task management ---------- */
@@ -1368,7 +1370,6 @@ static void sas_ex_smp_hook(struct domain_device *dev)
         memset(bin_attr, 0, sizeof(*bin_attr));
 
         bin_attr->attr.name = SMP_BIN_ATTR_NAME;
-        bin_attr->attr.owner = THIS_MODULE;
         bin_attr->attr.mode = 0600;
 
         bin_attr->size = 0;
@@ -1846,8 +1847,9 @@ out:
 #if 0
 /* ---------- SMP portal ---------- */
 
-static ssize_t smp_portal_write(struct kobject *kobj, char *buf, loff_t offs,
-                                size_t size)
+static ssize_t smp_portal_write(struct kobject *kobj,
+                                struct bin_attribute *bin_attr,
+                                char *buf, loff_t offs, size_t size)
 {
         struct domain_device *dev = to_dom_device(kobj);
         struct expander_device *ex = &dev->ex_dev;
@@ -1873,8 +1875,9 @@ static ssize_t smp_portal_write(struct kobject *kobj, char *buf, loff_t offs,
         return size;
 }
 
-static ssize_t smp_portal_read(struct kobject *kobj, char *buf, loff_t offs,
-                               size_t size)
+static ssize_t smp_portal_read(struct kobject *kobj,
+                               struct bin_attribute *bin_attr,
+                               char *buf, loff_t offs, size_t size)
 {
         struct domain_device *dev = to_dom_device(kobj);
         struct expander_device *ex = &dev->ex_dev;
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 6a2c1ac42442..860a52c090f4 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1405,7 +1405,8 @@ struct class_device_attribute *lpfc_hba_attrs[] = {
 };
 
 static ssize_t
-sysfs_ctlreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr,
+                   char *buf, loff_t off, size_t count)
 {
         size_t buf_off;
         struct class_device *cdev = container_of(kobj, struct class_device,
@@ -1437,7 +1438,8 @@ sysfs_ctlreg_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
 }
 
 static ssize_t
-sysfs_ctlreg_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+sysfs_ctlreg_read(struct kobject *kobj, struct bin_attribute *bin_attr,
+                  char *buf, loff_t off, size_t count)
 {
         size_t buf_off;
         uint32_t * tmp_ptr;
@@ -1474,7 +1476,6 @@ static struct bin_attribute sysfs_ctlreg_attr = {
         .attr = {
                 .name = "ctlreg",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 256,
         .read = sysfs_ctlreg_read,
@@ -1496,7 +1497,8 @@ sysfs_mbox_idle(struct lpfc_hba *phba)
 }
 
 static ssize_t
-sysfs_mbox_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
+sysfs_mbox_write(struct kobject *kobj, struct bin_attribute *bin_attr,
+                 char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj, struct class_device,
                                                  kobj);
@@ -1550,7 +1552,8 @@ sysfs_mbox_write(struct kobject *kobj, char *buf, loff_t off, size_t count)
 }
 
 static ssize_t
-sysfs_mbox_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
+sysfs_mbox_read(struct kobject *kobj, struct bin_attribute *bin_attr,
+                char *buf, loff_t off, size_t count)
 {
         struct class_device *cdev = container_of(kobj, struct class_device,
                                                  kobj);
@@ -1699,7 +1702,6 @@ static struct bin_attribute sysfs_mbox_attr = {
         .attr = {
                 .name = "mbox",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = MAILBOX_CMD_SIZE,
         .read = sysfs_mbox_read,
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 4a50e0a21470..f81f85ee190f 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1768,10 +1768,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
         phba->fabric_block_timer.data = (unsigned long) phba;
 
         pci_set_master(pdev);
-        retval = pci_set_mwi(pdev);
-        if (retval)
-                dev_printk(KERN_WARNING, &pdev->dev,
-                           "Warning: pci_set_mwi returned %d\n", retval);
+        pci_try_set_mwi(pdev);
 
         if (pci_set_dma_mask(phba->pcidev, DMA_64BIT_MASK) != 0)
                 if (pci_set_dma_mask(phba->pcidev, DMA_32BIT_MASK) != 0)
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 8cc9e64bbdff..7fed35372150 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -3379,15 +3379,6 @@ static int nsp32_resume(struct pci_dev *pdev)
         return 0;
 }
 
-/* Enable wake event */
-static int nsp32_enable_wake(struct pci_dev *pdev, pci_power_t state, int enable)
-{
-        struct Scsi_Host *host = pci_get_drvdata(pdev);
-
-        nsp32_msg(KERN_INFO, "pci-enable_wake: stub, pdev=0x%p, enable=%d, slot=%s, host=0x%p", pdev, enable, pci_name(pdev), host);
-
-        return 0;
-}
 #endif
 
 /************************************************************************
@@ -3451,7 +3442,6 @@ static struct pci_driver nsp32_driver = {
 #ifdef CONFIG_PM
         .suspend        = nsp32_suspend, 
         .resume         = nsp32_resume, 
-        .enable_wake    = nsp32_enable_wake,
 #endif
 };
 
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index b79c4dfc2a9c..3eb2208675ae 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -14,8 +14,9 @@ int qla24xx_vport_disable(struct fc_vport *, bool);
 /* SYSFS attributes --------------------------------------------------------- */
 
 static ssize_t
-qla2x00_sysfs_read_fw_dump(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_read_fw_dump(struct kobject *kobj,
+                           struct bin_attribute *bin_attr,
+                           char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -34,8 +35,9 @@ qla2x00_sysfs_read_fw_dump(struct kobject *kobj, char *buf, loff_t off,
 }
 
 static ssize_t
-qla2x00_sysfs_write_fw_dump(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_write_fw_dump(struct kobject *kobj,
+                            struct bin_attribute *bin_attr,
+                            char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -76,7 +78,6 @@ static struct bin_attribute sysfs_fw_dump_attr = {
         .attr = {
                 .name = "fw_dump",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 0,
         .read = qla2x00_sysfs_read_fw_dump,
@@ -84,8 +85,9 @@ static struct bin_attribute sysfs_fw_dump_attr = {
 };
 
 static ssize_t
-qla2x00_sysfs_read_nvram(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_read_nvram(struct kobject *kobj,
+                         struct bin_attribute *bin_attr,
+                         char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -104,8 +106,9 @@ qla2x00_sysfs_read_nvram(struct kobject *kobj, char *buf, loff_t off,
 }
 
 static ssize_t
-qla2x00_sysfs_write_nvram(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_write_nvram(struct kobject *kobj,
+                          struct bin_attribute *bin_attr,
+                          char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -152,7 +155,6 @@ static struct bin_attribute sysfs_nvram_attr = {
         .attr = {
                 .name = "nvram",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 512,
         .read = qla2x00_sysfs_read_nvram,
@@ -160,8 +162,9 @@ static struct bin_attribute sysfs_nvram_attr = {
 };
 
 static ssize_t
-qla2x00_sysfs_read_optrom(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_read_optrom(struct kobject *kobj,
+                          struct bin_attribute *bin_attr,
+                          char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -179,8 +182,9 @@ qla2x00_sysfs_read_optrom(struct kobject *kobj, char *buf, loff_t off,
 }
 
 static ssize_t
-qla2x00_sysfs_write_optrom(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_write_optrom(struct kobject *kobj,
+                           struct bin_attribute *bin_attr,
+                           char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -201,7 +205,6 @@ static struct bin_attribute sysfs_optrom_attr = {
         .attr = {
                 .name = "optrom",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = OPTROM_SIZE_24XX,
         .read = qla2x00_sysfs_read_optrom,
@@ -209,8 +212,9 @@ static struct bin_attribute sysfs_optrom_attr = {
 };
 
 static ssize_t
-qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_write_optrom_ctl(struct kobject *kobj,
+                               struct bin_attribute *bin_attr,
+                               char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -282,15 +286,15 @@ static struct bin_attribute sysfs_optrom_ctl_attr = {
         .attr = {
                 .name = "optrom_ctl",
                 .mode = S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 0,
         .write = qla2x00_sysfs_write_optrom_ctl,
 };
 
 static ssize_t
-qla2x00_sysfs_read_vpd(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_read_vpd(struct kobject *kobj,
+                       struct bin_attribute *bin_attr,
+                       char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -308,8 +312,9 @@ qla2x00_sysfs_read_vpd(struct kobject *kobj, char *buf, loff_t off,
 }
 
 static ssize_t
-qla2x00_sysfs_write_vpd(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_write_vpd(struct kobject *kobj,
+                        struct bin_attribute *bin_attr,
+                        char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -330,7 +335,6 @@ static struct bin_attribute sysfs_vpd_attr = {
         .attr = {
                 .name = "vpd",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = 0,
         .read = qla2x00_sysfs_read_vpd,
@@ -338,8 +342,9 @@ static struct bin_attribute sysfs_vpd_attr = {
 };
 
 static ssize_t
-qla2x00_sysfs_read_sfp(struct kobject *kobj, char *buf, loff_t off,
-    size_t count)
+qla2x00_sysfs_read_sfp(struct kobject *kobj,
+                       struct bin_attribute *bin_attr,
+                       char *buf, loff_t off, size_t count)
 {
         struct scsi_qla_host *ha = to_qla_host(dev_to_shost(container_of(kobj,
             struct device, kobj)));
@@ -378,7 +383,6 @@ static struct bin_attribute sysfs_sfp_attr = {
         .attr = {
                 .name = "sfp",
                 .mode = S_IRUSR | S_IWUSR,
-                .owner = THIS_MODULE,
         },
         .size = SFP_DEV_SIZE * 2,
         .read = qla2x00_sysfs_read_sfp,
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index bd95f7dc5cfc..cc6ebb609e98 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -296,7 +296,7 @@ qla24xx_pci_config(scsi_qla_host_t *ha)
         d &= ~PCI_ROM_ADDRESS_ENABLE;
         pci_write_config_dword(ha->pdev, PCI_ROM_ADDRESS, d);
 
-        pci_read_config_word(ha->pdev, PCI_REVISION_ID, &ha->chip_revision);
+        ha->chip_revision = ha->pdev->revision;
 
         /* Get PCI bus information. */
         spin_lock_irqsave(&ha->hardware_lock, flags);
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index a8658b1d284f..b5a77b0c0deb 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2610,7 +2610,7 @@ qla2x00_down_timeout(struct semaphore *sema, unsigned long timeout)
                         return 0;
                 if (msleep_interruptible(step))
                         break;
-        } while (--iterations >= 0);
+        } while (--iterations > 0);
 
         return -ETIMEDOUT;
 }
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 0827df2ebb6d..a86e62f4b3ba 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -184,6 +184,15 @@ int scsi_complete_async_scans(void)
 /* Only exported for the benefit of scsi_wait_scan */
 EXPORT_SYMBOL_GPL(scsi_complete_async_scans);
 
+#ifndef MODULE
+/*
+ * For async scanning we need to wait for all the scans to complete before
+ * trying to mount the root fs.  Otherwise non-modular drivers may not be ready
+ * yet.
+ */
+late_initcall(scsi_complete_async_scans);
+#endif
+
 /**
  * scsi_unlock_floptical - unlock device via a special MODE SENSE command
  * @sdev:       scsi device to send command to