Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / scsi / scsi_transport_sas.c

diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 2871fd05fcf73921e5bfd71a9c05fde509785aa9..3120f4b3a11a806254a3eb3dcbf3f71cc4c6e40b 100644 (file)
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -42,6 +42,7 @@
 struct sas_host_attrs {
        struct list_head rphy_list;
        struct mutex lock;
+       struct request_queue *q;
        u32 next_target_id;
        u32 next_expander_id;
        int next_port_id;
@@ -190,30 +191,44 @@ static void sas_non_host_smp_request(struct request_queue *q)
        sas_smp_request(q, rphy_to_shost(rphy), rphy);
 }
 
-static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy,
-                             char *name)
+static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)
 {
        struct request_queue *q;
        int error;
+       struct device *dev;
+       char namebuf[BUS_ID_SIZE];
+       const char *name;
 
        if (!to_sas_internal(shost->transportt)->f->smp_handler) {
                printk("%s can't handle SMP requests\n", shost->hostt->name);
                return 0;
        }
 
-       if (rphy)
+       if (rphy) {
                q = blk_init_queue(sas_non_host_smp_request, NULL);
-       else
+               dev = &rphy->dev;
+               name = dev->bus_id;
+       } else {
                q = blk_init_queue(sas_host_smp_request, NULL);
+               dev = &shost->shost_gendev;
+               snprintf(namebuf, sizeof(namebuf),
+                        "sas_host%d", shost->host_no);
+               name = namebuf;
+       }
        if (!q)
                return -ENOMEM;
 
-       error = bsg_register_queue(q, name);
+       error = bsg_register_queue(q, dev, name);
        if (error) {
                blk_cleanup_queue(q);
                return -ENOMEM;
        }
 
+       if (rphy)
+               rphy->q = q;
+       else
+               to_sas_host_attrs(shost)->q = q;
+
        if (rphy)
                q->queuedata = rphy;
        else
@@ -224,6 +239,22 @@ static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy,
        return 0;
 }
 
+static void sas_bsg_remove(struct Scsi_Host *shost, struct sas_rphy *rphy)
+{
+       struct request_queue *q;
+
+       if (rphy)
+               q = rphy->q;
+       else
+               q = to_sas_host_attrs(shost)->q;
+
+       if (!q)
+               return;
+
+       bsg_unregister_queue(q);
+       blk_cleanup_queue(q);
+}
+
 /*
  * SAS host attributes
  */
@@ -233,7 +264,6 @@ static int sas_host_setup(struct transport_container *tc, struct device *dev,
 {
        struct Scsi_Host *shost = dev_to_shost(dev);
        struct sas_host_attrs *sas_host = to_sas_host_attrs(shost);
-       char name[BUS_ID_SIZE];
 
        INIT_LIST_HEAD(&sas_host->rphy_list);
        mutex_init(&sas_host->lock);
@@ -241,16 +271,25 @@ static int sas_host_setup(struct transport_container *tc, struct device *dev,
        sas_host->next_expander_id = 0;
        sas_host->next_port_id = 0;
 
-       snprintf(name, sizeof(name), "sas_host%d", shost->host_no);
-       if (sas_bsg_initialize(shost, NULL, name))
+       if (sas_bsg_initialize(shost, NULL))
                dev_printk(KERN_ERR, dev, "fail to a bsg device %d\n",
                           shost->host_no);
 
        return 0;
 }
 
+static int sas_host_remove(struct transport_container *tc, struct device *dev,
+                          struct class_device *cdev)
+{
+       struct Scsi_Host *shost = dev_to_shost(dev);
+
+       sas_bsg_remove(shost, NULL);
+
+       return 0;
+}
+
 static DECLARE_TRANSPORT_CLASS(sas_host_class,
-               "sas_host", sas_host_setup, NULL, NULL);
+               "sas_host", sas_host_setup, sas_host_remove, NULL);
 
 static int sas_host_match(struct attribute_container *cont,
                            struct device *dev)
@@ -1300,9 +1339,6 @@ struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)
        sas_rphy_initialize(&rdev->rphy);
        transport_setup_device(&rdev->rphy.dev);
 
-       if (sas_bsg_initialize(shost, &rdev->rphy, rdev->rphy.dev.bus_id))
-               printk("fail to a bsg device %s\n", rdev->rphy.dev.bus_id);
-
        return &rdev->rphy;
 }
 EXPORT_SYMBOL(sas_end_device_alloc);
@@ -1342,9 +1378,6 @@ struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
        sas_rphy_initialize(&rdev->rphy);
        transport_setup_device(&rdev->rphy.dev);
 
-       if (sas_bsg_initialize(shost, &rdev->rphy, rdev->rphy.dev.bus_id))
-               printk("fail to a bsg device %s\n", rdev->rphy.dev.bus_id);
-
        return &rdev->rphy;
 }
 EXPORT_SYMBOL(sas_expander_alloc);
@@ -1372,6 +1405,9 @@ int sas_rphy_add(struct sas_rphy *rphy)
                return error;
        transport_add_device(&rphy->dev);
        transport_configure_device(&rphy->dev);
+       if (sas_bsg_initialize(shost, rphy))
+               printk("fail to a bsg device %s\n", rphy->dev.bus_id);
+
 
        mutex_lock(&sas_host->lock);
        list_add_tail(&rphy->list, &sas_host->rphy_list);
@@ -1414,6 +1450,8 @@ void sas_rphy_free(struct sas_rphy *rphy)
        list_del(&rphy->list);
        mutex_unlock(&sas_host->lock);
 
+       sas_bsg_remove(shost, rphy);
+
        transport_destroy_device(dev);
 
        put_device(dev);