driver core: Convert some drivers to CLASS_ATTR_STRING

[safe/jmp/linux-2.6] / drivers / infiniband / core / ucm.c

diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 51bd966..017d6e2 100644 (file)
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -38,6 +38,7 @@
 #include <linux/device.h>
 #include <linux/err.h>
 #include <linux/poll.h>
+#include <linux/sched.h>
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/cdev.h>
@@ -1214,15 +1215,18 @@ static void ib_ucm_release_dev(struct device *dev)
 
        ucm_dev = container_of(dev, struct ib_ucm_device, dev);
        cdev_del(&ucm_dev->cdev);
-       clear_bit(ucm_dev->devnum, dev_map);
+       if (ucm_dev->devnum < IB_UCM_MAX_DEVICES)
+               clear_bit(ucm_dev->devnum, dev_map);
+       else
+               clear_bit(ucm_dev->devnum - IB_UCM_MAX_DEVICES, dev_map);
        kfree(ucm_dev);
 }
 
 static const struct file_operations ucm_fops = {
-       .owner   = THIS_MODULE,
-       .open    = ib_ucm_open,
+       .owner   = THIS_MODULE,
+       .open    = ib_ucm_open,
        .release = ib_ucm_close,
-       .write   = ib_ucm_write,
+       .write   = ib_ucm_write,
        .poll    = ib_ucm_poll,
 };
 
@@ -1236,8 +1240,32 @@ static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL);
 
+static dev_t overflow_maj;
+static DECLARE_BITMAP(overflow_map, IB_UCM_MAX_DEVICES);
+static int find_overflow_devnum(void)
+{
+       int ret;
+
+       if (!overflow_maj) {
+               ret = alloc_chrdev_region(&overflow_maj, 0, IB_UCM_MAX_DEVICES,
+                                         "infiniband_cm");
+               if (ret) {
+                       printk(KERN_ERR "ucm: couldn't register dynamic device number\n");
+                       return ret;
+               }
+       }
+
+       ret = find_first_zero_bit(overflow_map, IB_UCM_MAX_DEVICES);
+       if (ret >= IB_UCM_MAX_DEVICES)
+               return -1;
+
+       return ret;
+}
+
 static void ib_ucm_add_one(struct ib_device *device)
 {
+       int devnum;
+       dev_t base;
        struct ib_ucm_device *ucm_dev;
 
        if (!device->alloc_ucontext ||
@@ -1250,16 +1278,25 @@ static void ib_ucm_add_one(struct ib_device *device)
 
        ucm_dev->ib_dev = device;
 
-       ucm_dev->devnum = find_first_zero_bit(dev_map, IB_UCM_MAX_DEVICES);
-       if (ucm_dev->devnum >= IB_UCM_MAX_DEVICES)
-               goto err;
-
-       set_bit(ucm_dev->devnum, dev_map);
+       devnum = find_first_zero_bit(dev_map, IB_UCM_MAX_DEVICES);
+       if (devnum >= IB_UCM_MAX_DEVICES) {
+               devnum = find_overflow_devnum();
+               if (devnum < 0)
+                       goto err;
+
+               ucm_dev->devnum = devnum + IB_UCM_MAX_DEVICES;
+               base = devnum + overflow_maj;
+               set_bit(devnum, overflow_map);
+       } else {
+               ucm_dev->devnum = devnum;
+               base = devnum + IB_UCM_BASE_DEV;
+               set_bit(devnum, dev_map);
+       }
 
        cdev_init(&ucm_dev->cdev, &ucm_fops);
        ucm_dev->cdev.owner = THIS_MODULE;
        kobject_set_name(&ucm_dev->cdev.kobj, "ucm%d", ucm_dev->devnum);
-       if (cdev_add(&ucm_dev->cdev, IB_UCM_BASE_DEV + ucm_dev->devnum, 1))
+       if (cdev_add(&ucm_dev->cdev, base, 1))
                goto err;
 
        ucm_dev->dev.class = &cm_class;
@@ -1280,7 +1317,10 @@ err_dev:
        device_unregister(&ucm_dev->dev);
 err_cdev:
        cdev_del(&ucm_dev->cdev);
-       clear_bit(ucm_dev->devnum, dev_map);
+       if (ucm_dev->devnum < IB_UCM_MAX_DEVICES)
+               clear_bit(devnum, dev_map);
+       else
+               clear_bit(devnum, overflow_map);
 err:
        kfree(ucm_dev);
        return;
@@ -1296,11 +1336,8 @@ static void ib_ucm_remove_one(struct ib_device *device)
        device_unregister(&ucm_dev->dev);
 }
 
-static ssize_t show_abi_version(struct class *class, char *buf)
-{
-       return sprintf(buf, "%d\n", IB_USER_CM_ABI_VERSION);
-}
-static CLASS_ATTR(abi_version, S_IRUGO, show_abi_version, NULL);
+static CLASS_ATTR_STRING(abi_version, S_IRUGO,
+                        __stringify(IB_USER_CM_ABI_VERSION));
 
 static int __init ib_ucm_init(void)
 {
@@ -1313,7 +1350,7 @@ static int __init ib_ucm_init(void)
                goto error1;
        }
 
-       ret = class_create_file(&cm_class, &class_attr_abi_version);
+       ret = class_create_file(&cm_class, &class_attr_abi_version.attr);
        if (ret) {
                printk(KERN_ERR "ucm: couldn't create abi_version attribute\n");
                goto error2;
@@ -1327,7 +1364,7 @@ static int __init ib_ucm_init(void)
        return 0;
 
 error3:
-       class_remove_file(&cm_class, &class_attr_abi_version);
+       class_remove_file(&cm_class, &class_attr_abi_version.attr);
 error2:
        unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
 error1:
@@ -1337,8 +1374,10 @@ error1:
 static void __exit ib_ucm_cleanup(void)
 {
        ib_unregister_client(&ucm_client);
-       class_remove_file(&cm_class, &class_attr_abi_version);
+       class_remove_file(&cm_class, &class_attr_abi_version.attr);
        unregister_chrdev_region(IB_UCM_BASE_DEV, IB_UCM_MAX_DEVICES);
+       if (overflow_maj)
+               unregister_chrdev_region(overflow_maj, IB_UCM_MAX_DEVICES);
        idr_destroy(&ctx_id_table);
 }