[SCSI] bsg: separate bsg and SCSI (so SCSI can be modular)

This patch moves the bsg registration into SCSI so that bsg no longer
has a dependency on the scsi_interface_register API.

This can be viewed as a temporary expedient until we can get universal
bsg binding sorted out properly.  Also use the sdev bus_id as the
generic bsg name (to avoid clashes with the queue name).

Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/block/Kconfig b/block/Kconfig
index 0768741d681364d1ee71bbd82ace768b31271d9d..ca2ef4e08497f21a8f5f542031839f3e63e18b48 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -53,7 +53,7 @@ endif # BLOCK
 
 config BLK_DEV_BSG
        bool "Block layer SG support v4 (EXPERIMENTAL)"
-       depends on (SCSI=y) && EXPERIMENTAL
+       depends on EXPERIMENTAL
        ---help---
        Saying Y here will enable generic SG (SCSI generic) v4 support
        for any block device.

diff --git a/block/bsg.c b/block/bsg.c
index baa04e7adf197331c34d4b0b46f8956f92b7b4b9..4e0be1b2e2a084812ba731f21f068c289502307e 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1009,29 +1009,6 @@ err:
 }
 EXPORT_SYMBOL_GPL(bsg_register_queue);
 
-static int bsg_add(struct class_device *cl_dev, struct class_interface *cl_intf)
-{
-       int ret;
-       struct scsi_device *sdp = to_scsi_device(cl_dev->dev);
-       struct request_queue *rq = sdp->request_queue;
-
-       if (rq->kobj.parent)
-               ret = bsg_register_queue(rq, kobject_name(rq->kobj.parent));
-       else
-               ret = bsg_register_queue(rq, kobject_name(&sdp->sdev_gendev.kobj));
-       return ret;
-}
-
-static void bsg_remove(struct class_device *cl_dev, struct class_interface *cl_intf)
-{
-       bsg_unregister_queue(to_scsi_device(cl_dev->dev)->request_queue);
-}
-
-static struct class_interface bsg_intf = {
-       .add    = bsg_add,
-       .remove = bsg_remove,
-};
-
 static struct cdev bsg_cdev = {
        .kobj   = {.name = "bsg", },
        .owner  = THIS_MODULE,
@@ -1069,16 +1046,9 @@ static int __init bsg_init(void)
        if (ret)
                goto unregister_chrdev;
 
-       ret = scsi_register_interface(&bsg_intf);
-       if (ret)
-               goto remove_cdev;
-
        printk(KERN_INFO BSG_DESCRIPTION " version " BSG_VERSION
               " loaded (major %d)\n", bsg_major);
        return 0;
-remove_cdev:
-       printk(KERN_ERR "bsg: failed register scsi interface %d\n", ret);
-       cdev_del(&bsg_cdev);
 unregister_chrdev:
        unregister_chrdev_region(MKDEV(bsg_major, 0), BSG_MAX_DEVS);
 destroy_bsg_class:

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 34e483d31c18a741a6d8f326c2b14c7414f97b59..ad5f21fd5d450592b01dfe626465cbd45467697e 100644 (file)
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -715,6 +715,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;
@@ -734,6 +735,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.bus_id);
+
+       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,
@@ -780,6 +792,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);