V4L/DVB (5799): Or51211: remove hardcoded fcv1236d tuner programming

[linux-2.6-omap-h63xx.git] / block / bsg.c

diff --git a/block/bsg.c b/block/bsg.c
index cdb00e5544b10712ff261c04310902a9695580c0..baa04e7adf197331c34d4b0b46f8956f92b7b4b9 100644 (file)
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -33,7 +33,8 @@
 #include <scsi/scsi_driver.h>
 #include <scsi/sg.h>
 
-const static char bsg_version[] = "block layer sg (bsg) 0.4";
+#define BSG_DESCRIPTION        "Block layer SCSI generic (bsg) driver"
+#define BSG_VERSION    "0.4"
 
 struct bsg_device {
        request_queue_t *queue;
@@ -72,7 +73,6 @@ static DEFINE_MUTEX(bsg_mutex);
 static int bsg_device_nr, bsg_minor_idx;
 
 #define BSG_LIST_ARRAY_SIZE    8
-#define bsg_list_idx(minor)    ((minor) & (BSG_LIST_ARRAY_SIZE - 1))
 static struct hlist_head bsg_device_list[BSG_LIST_ARRAY_SIZE];
 
 static struct class *bsg_class;
@@ -139,9 +139,9 @@ out:
        return bc;
 }
 
-static inline void
-bsg_add_done_cmd(struct bsg_device *bd, struct bsg_command *bc)
+static inline struct hlist_head *bsg_dev_idx_hash(int index)
 {
+       return &bsg_device_list[index & (BSG_LIST_ARRAY_SIZE - 1)];
 }
 
 static int bsg_io_schedule(struct bsg_device *bd)
@@ -748,8 +748,7 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
        atomic_set(&bd->ref_count, 1);
        bd->minor = iminor(inode);
        mutex_lock(&bsg_mutex);
-       hlist_add_head(&bd->dev_list,
-               &bsg_device_list[bd->minor & (BSG_LIST_ARRAY_SIZE - 1)]);
+       hlist_add_head(&bd->dev_list, bsg_dev_idx_hash(bd->minor));
 
        strncpy(bd->name, rq->bsg_dev.class_dev->class_id, sizeof(bd->name) - 1);
        dprintk("bound to <%s>, max queue %d\n",
@@ -761,14 +760,12 @@ static struct bsg_device *bsg_add_device(struct inode *inode,
 
 static struct bsg_device *__bsg_get_device(int minor)
 {
-       struct hlist_head *list;
        struct bsg_device *bd = NULL;
        struct hlist_node *entry;
 
        mutex_lock(&bsg_mutex);
 
-       list = &bsg_device_list[minor & (BSG_LIST_ARRAY_SIZE - 1)];
-       hlist_for_each(entry, list) {
+       hlist_for_each(entry, bsg_dev_idx_hash(minor)) {
                bd = hlist_entry(entry, struct bsg_device, dev_list);
                if (bd->minor == minor) {
                        atomic_inc(&bd->ref_count);
@@ -1057,43 +1054,42 @@ static int __init bsg_init(void)
 
        bsg_class = class_create(THIS_MODULE, "bsg");
        if (IS_ERR(bsg_class)) {
-               kmem_cache_destroy(bsg_cmd_cachep);
-               return PTR_ERR(bsg_class);
+               ret = PTR_ERR(bsg_class);
+               goto destroy_kmemcache;
        }
 
        ret = alloc_chrdev_region(&devid, 0, BSG_MAX_DEVS, "bsg");
-       if (ret) {
-               kmem_cache_destroy(bsg_cmd_cachep);
-               class_destroy(bsg_class);
-               return ret;
-       }
+       if (ret)
+               goto destroy_bsg_class;
 
        bsg_major = MAJOR(devid);
 
        cdev_init(&bsg_cdev, &bsg_fops);
        ret = cdev_add(&bsg_cdev, MKDEV(bsg_major, 0), BSG_MAX_DEVS);
-       if (ret) {
-               kmem_cache_destroy(bsg_cmd_cachep);
-               class_destroy(bsg_class);
-               unregister_chrdev_region(MKDEV(bsg_major, 0), BSG_MAX_DEVS);
-               return ret;
-       }
+       if (ret)
+               goto unregister_chrdev;
 
        ret = scsi_register_interface(&bsg_intf);
-       if (ret) {
-               printk(KERN_ERR "bsg: failed register scsi interface %d\n", ret);
-               kmem_cache_destroy(bsg_cmd_cachep);
-               class_destroy(bsg_class);
-               unregister_chrdev(bsg_major, "bsg");
-               return ret;
-       }
+       if (ret)
+               goto remove_cdev;
 
-       printk(KERN_INFO "%s loaded (major %d)\n", bsg_version, bsg_major);
+       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:
+       class_destroy(bsg_class);
+destroy_kmemcache:
+       kmem_cache_destroy(bsg_cmd_cachep);
+       return ret;
 }
 
 MODULE_AUTHOR("Jens Axboe");
-MODULE_DESCRIPTION("Block layer SGSI generic (sg) driver");
+MODULE_DESCRIPTION(BSG_DESCRIPTION);
 MODULE_LICENSE("GPL");
 
 device_initcall(bsg_init);