Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux-2.6-microblaze.git] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 24b72ee..cda0135 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -377,7 +377,7 @@ static struct device_type scsi_host_type = {
 struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 {
        struct Scsi_Host *shost;
-       int index;
+       int index, i, j = 0;
 
        shost = kzalloc(sizeof(struct Scsi_Host) + privsize, GFP_KERNEL);
        if (!shost)
@@ -476,12 +476,23 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
        dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);
        shost->shost_gendev.bus = &scsi_bus_type;
        shost->shost_gendev.type = &scsi_host_type;
+       scsi_enable_async_suspend(&shost->shost_gendev);
 
        device_initialize(&shost->shost_dev);
        shost->shost_dev.parent = &shost->shost_gendev;
        shost->shost_dev.class = &shost_class;
        dev_set_name(&shost->shost_dev, "host%d", shost->host_no);
-       shost->shost_dev.groups = scsi_sysfs_shost_attr_groups;
+       shost->shost_dev.groups = shost->shost_dev_attr_groups;
+       shost->shost_dev_attr_groups[j++] = &scsi_shost_attr_group;
+       if (sht->shost_groups) {
+               for (i = 0; sht->shost_groups[i] &&
+                            j < ARRAY_SIZE(shost->shost_dev_attr_groups);
+                    i++, j++) {
+                       shost->shost_dev_attr_groups[j] =
+                               sht->shost_groups[i];
+               }
+       }
+       WARN_ON_ONCE(j >= ARRAY_SIZE(shost->shost_dev_attr_groups));
 
        shost->ehandler = kthread_run(scsi_error_handler, shost,
                        "scsi_eh_%d", shost->host_no);
@@ -667,7 +678,7 @@ static bool complete_all_cmds_iter(struct request *rq, void *data, bool rsvd)
        scsi_dma_unmap(scmd);
        scmd->result = 0;
        set_host_byte(scmd, status);
-       scmd->scsi_done(scmd);
+       scsi_done(scmd);
        return true;
 }