staging:iio: Move event attributes into the event[n] device in sysfs

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

diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index ad830b64c912f8a1ae5bb38888369fc9b3bec534..a4ce2215e54ad03df08e0f90abf8a6222eedbf8c 100644 (file)
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -676,16 +676,14 @@ static int iio_device_register_eventset(struct iio_dev *dev_info)
                                         dev_info->event_interfaces[i].id);
                        goto error_free_setup_ev_ints;
                }
-       }
 
-       for (i = 0; i < dev_info->num_interrupt_lines; i++) {
-               snprintf(dev_info->event_interfaces[i]._attrname, 20,
-                       "event_line%d_sources", i);
-               dev_info->event_attrs[i].name
-                       = (const char *)
-                       (dev_info->event_interfaces[i]._attrname);
-               ret = sysfs_create_group(&dev_info->dev.kobj,
-                                        &dev_info->event_attrs[i]);
+               dev_set_drvdata(&dev_info->event_interfaces[i].dev,
+                               (void *)dev_info);
+               ret = sysfs_create_group(&dev_info
+                                       ->event_interfaces[i]
+                                       .dev.kobj,
+                                       &dev_info->event_attrs[i]);
+
                if (ret) {
                        dev_err(&dev_info->dev,
                                "Failed to register sysfs for event attrs");
@@ -707,13 +705,13 @@ error_unregister_config_attrs:
        i = dev_info->num_interrupt_lines - 1;
 error_remove_sysfs_interfaces:
        for (j = 0; j < i; j++)
-               sysfs_remove_group(&dev_info->dev.kobj,
+               sysfs_remove_group(&dev_info
+                                  ->event_interfaces[j].dev.kobj,
                                   &dev_info->event_attrs[j]);
-       i = dev_info->num_interrupt_lines - 1;
 error_free_setup_ev_ints:
        for (j = 0; j < i; j++) {
                iio_free_idr_val(&iio_event_idr,
-                                dev_info->event_interfaces[i].id);
+                                dev_info->event_interfaces[j].id);
                iio_free_ev_int(&dev_info->event_interfaces[j]);
        }
        kfree(dev_info->interrupts);
@@ -731,7 +729,8 @@ static void iio_device_unregister_eventset(struct iio_dev *dev_info)
        if (dev_info->num_interrupt_lines == 0)
                return;
        for (i = 0; i < dev_info->num_interrupt_lines; i++)
-               sysfs_remove_group(&dev_info->dev.kobj,
+               sysfs_remove_group(&dev_info
+                                  ->event_interfaces[i].dev.kobj,
                                   &dev_info->event_attrs[i]);
 
        for (i = 0; i < dev_info->num_interrupt_lines; i++) {