Driver core: change add_uevent_var to use a struct

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

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 67a38a1409ba0e8274b2d24292a88aea959000ac..ede9986d349ad00ee4baa1ffbb14fe157fa5d65c 100644 (file)
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -16,6 +16,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
 #include <scsi/scsi_transport.h>
+#include <scsi/scsi_driver.h>
 
 #include "scsi_priv.h"
 #include "scsi_logging.h"
@@ -276,16 +277,11 @@ static int scsi_bus_match(struct device *dev, struct device_driver *gendrv)
        return (sdp->inq_periph_qual == SCSI_INQ_PQ_CON)? 1: 0;
 }
 
-static int scsi_bus_uevent(struct device *dev, char **envp, int num_envp,
-                          char *buffer, int buffer_size)
+static int scsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct scsi_device *sdev = to_scsi_device(dev);
-       int i = 0;
-       int length = 0;
 
-       add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
-                      "MODALIAS=" SCSI_DEVICE_MODALIAS_FMT, sdev->type);
-       envp[i] = NULL;
+       add_uevent_var(env, "MODALIAS=" SCSI_DEVICE_MODALIAS_FMT, sdev->type);
        return 0;
 }
 
@@ -293,30 +289,18 @@ static int scsi_bus_suspend(struct device * dev, pm_message_t state)
 {
        struct device_driver *drv = dev->driver;
        struct scsi_device *sdev = to_scsi_device(dev);
-       struct scsi_host_template *sht = sdev->host->hostt;
        int err;
 
        err = scsi_device_quiesce(sdev);
        if (err)
                return err;
 
-       /* call HLD suspend first */
        if (drv && drv->suspend) {
                err = drv->suspend(dev, state);
                if (err)
                        return err;
        }
 
-       /* then, call host suspend */
-       if (sht->suspend) {
-               err = sht->suspend(sdev, state);
-               if (err) {
-                       if (drv && drv->resume)
-                               drv->resume(dev);
-                       return err;
-               }
-       }
-
        return 0;
 }
 
@@ -324,21 +308,14 @@ static int scsi_bus_resume(struct device * dev)
 {
        struct device_driver *drv = dev->driver;
        struct scsi_device *sdev = to_scsi_device(dev);
-       struct scsi_host_template *sht = sdev->host->hostt;
-       int err = 0, err2 = 0;
+       int err = 0;
 
-       /* call host resume first */
-       if (sht->resume)
-               err = sht->resume(sdev);
-
-       /* then, call HLD resume */
        if (drv && drv->resume)
-               err2 = drv->resume(dev);
+               err = drv->resume(dev);
 
        scsi_device_resume(sdev);
 
-       /* favor LLD failure */
-       return err ? err : err2;;
+       return err;
 }
 
 struct bus_type scsi_bus_type = {
@@ -733,6 +710,7 @@ static int attr_add(struct device *dev, struct device_attribute *attr)
 int scsi_sysfs_add_sdev(struct scsi_device *sdev)
 {
        int error, i;
+       struct request_queue *rq = sdev->request_queue;
 
        if ((error = scsi_device_set_state(sdev, SDEV_RUNNING)) != 0)
                return error;
@@ -752,6 +730,17 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
        /* take a reference for the sdev_classdev; this is
         * released by the sdev_class .release */
        get_device(&sdev->sdev_gendev);
+
+       error = bsg_register_queue(rq, &sdev->sdev_gendev, NULL);
+
+       if (error)
+               sdev_printk(KERN_INFO, sdev,
+                           "Failed to register bsg queue, errno=%d\n", error);
+
+       /* we're treating error on bsg register as non-fatal, so pretend
+        * nothing went wrong */
+       error = 0;
+
        if (sdev->host->hostt->sdev_attrs) {
                for (i = 0; sdev->host->hostt->sdev_attrs[i]; i++) {
                        error = attr_add(&sdev->sdev_gendev,
@@ -798,6 +787,7 @@ void __scsi_remove_device(struct scsi_device *sdev)
        if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0)
                return;
 
+       bsg_unregister_queue(sdev->request_queue);
        class_device_unregister(&sdev->sdev_classdev);
        transport_remove_device(dev);
        device_del(dev);
@@ -822,7 +812,7 @@ void scsi_remove_device(struct scsi_device *sdev)
 }
 EXPORT_SYMBOL(scsi_remove_device);
 
-void __scsi_remove_target(struct scsi_target *starget)
+static void __scsi_remove_target(struct scsi_target *starget)
 {
        struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
        unsigned long flags;