staging: iio: Move from class to bus

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index a12072a93cde93d532249211150f82503dbe0f7d..fcee47cbe894e34d658cbdb7ad26339d4013e6f2 100644 (file)
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -377,7 +377,7 @@ void iio_deallocate_chrdev(struct iio_handler *handler);
 #define IIO_UNSIGNED(a) (a)
 
 extern dev_t iio_devt;
-extern struct class iio_class;
+extern struct bus_type iio_bus_type;
 
 /**
  * iio_put_device() - reference counted deallocation of struct device

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 7c9a12e0e8fe0aaf518f7840b078443b4a41172c..ad830b64c912f8a1ae5bb38888369fc9b3bec534 100644 (file)
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -42,16 +42,10 @@ dev_t iio_devt;
 EXPORT_SYMBOL(iio_devt);
 
 #define IIO_DEV_MAX 256
-static char *iio_devnode(struct device *dev, mode_t *mode)
-{
-       return kasprintf(GFP_KERNEL, "iio/%s", dev_name(dev));
-}
-
-struct class iio_class = {
+struct bus_type iio_bus_type = {
        .name = "iio",
-       .devnode = iio_devnode,
 };
-EXPORT_SYMBOL(iio_class);
+EXPORT_SYMBOL(iio_bus_type);
 
 void __iio_change_event(struct iio_detected_event_list *ev,
                        int ev_code,
@@ -405,7 +399,7 @@ int iio_setup_ev_int(struct iio_event_interface *ev_int,
 {
        int ret, minor;
 
-       ev_int->dev.class = &iio_class;
+       ev_int->dev.bus = &iio_bus_type;
        ev_int->dev.parent = dev;
        ev_int->dev.type = &iio_event_type;
        device_initialize(&ev_int->dev);
@@ -478,23 +472,23 @@ static int __init iio_init(void)
 {
        int ret;
 
-       /* Create sysfs class */
-       ret  = class_register(&iio_class);
+       /* Register sysfs bus */
+       ret  = bus_register(&iio_bus_type);
        if (ret < 0) {
                printk(KERN_ERR
-                      "%s could not create sysfs class\n",
+                      "%s could not register bus type\n",
                        __FILE__);
                goto error_nothing;
        }
 
        ret = iio_dev_init();
        if (ret < 0)
-               goto error_unregister_class;
+               goto error_unregister_bus_type;
 
        return 0;
 
-error_unregister_class:
-       class_unregister(&iio_class);
+error_unregister_bus_type:
+       bus_unregister(&iio_bus_type);
 error_nothing:
        return ret;
 }
@@ -502,7 +496,7 @@ error_nothing:
 static void __exit iio_exit(void)
 {
        iio_dev_exit();
-       class_unregister(&iio_class);
+       bus_unregister(&iio_bus_type);
 }
 
 static int iio_device_register_sysfs(struct iio_dev *dev_info)
@@ -768,7 +762,7 @@ struct iio_dev *iio_allocate_device(void)
 
        if (dev) {
                dev->dev.type = &iio_dev_type;
-               dev->dev.class = &iio_class;
+               dev->dev.bus = &iio_bus_type;
                device_initialize(&dev->dev);
                dev_set_drvdata(&dev->dev, (void *)dev);
                mutex_init(&dev->mlock);

diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c
index 5f48632e4258accabe18f32a602a135409bdaac6..690df91020e9e12bbc9ad68af0c43da3cf86975d 100644 (file)
--- a/drivers/staging/iio/industrialio-ring.c
+++ b/drivers/staging/iio/industrialio-ring.c
@@ -210,7 +210,7 @@ __iio_request_ring_buffer_access_chrdev(struct iio_ring_buffer *buf,
        buf->access_handler.flags = 0;
 
        buf->access_dev.parent = &buf->dev;
-       buf->access_dev.class = &iio_class;
+       buf->access_dev.bus = &iio_bus_type;
        buf->access_dev.type = &iio_ring_access_type;
        device_initialize(&buf->access_dev);
 

diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 3c8f6ffab584b563e4cc0b25f8b0e2108fa461c7..918b0fd2b83e8e4a55fbc19f764d9325a4951075 100644 (file)
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/drivers/staging/iio/industrialio-trigger.c
@@ -365,7 +365,7 @@ struct iio_trigger *iio_allocate_trigger(void)
        trig = kzalloc(sizeof *trig, GFP_KERNEL);
        if (trig) {
                trig->dev.type = &iio_trig_type;
-               trig->dev.class = &iio_class;
+               trig->dev.bus = &iio_bus_type;
                device_initialize(&trig->dev);
                dev_set_drvdata(&trig->dev, (void *)trig);
                spin_lock_init(&trig->pollfunc_list_lock);

diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c
index e9570e33694e42c05ec39f775d0179c341e5681d..f8de45dc4b6e3528b70ed2ce9fe91b65f8cb753d 100644 (file)
--- a/drivers/staging/iio/ring_sw.c
+++ b/drivers/staging/iio/ring_sw.c
@@ -419,7 +419,7 @@ struct iio_ring_buffer *iio_sw_rb_allocate(struct iio_dev *indio_dev)
        buf->dev.type = &iio_sw_ring_type;
        device_initialize(&buf->dev);
        buf->dev.parent = &indio_dev->dev;
-       buf->dev.class = &iio_class;
+       buf->dev.bus = &iio_bus_type;
        dev_set_drvdata(&buf->dev, (void *)buf);
 
        return buf;