staging:iio:adc:adt7310/7410 sticking plaster fix for broken event attrs.

Neither of these drivers has ever been anywhere near the iio abi.
Probably as a result of this the fact they had two event groups
each was not picked up when we restricted IIO to having only
1 event line per device (as part of the chrdev merge set).

As such these definitely didn't work before.  This patch squishes
the only element from the 'comparator' event line that isn't in the
'interrupt' one into it and kills off the 'comparator' one.

Ultimately both of these drivers belong in hwmon not IIO and are just
waiting here because I don't want to kill off a driver that may
prove useful to someone.  (Ultimately I will ask Greg to scrap
these two if no one steps up to deal with them.)

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/iio/adc/adt7310.c b/drivers/staging/iio/adc/adt7310.c
index eec2f325d5494dfaa52c4b32bd4b6aa46d7214a1..caf57c1169b1482bce1e40e5e99dd977e83d6215 100644 (file)
--- a/drivers/staging/iio/adc/adt7310.c
+++ b/drivers/staging/iio/adc/adt7310.c
@@ -725,32 +725,19 @@ static struct attribute *adt7310_event_int_attributes[] = {
        &iio_dev_attr_fault_queue.dev_attr.attr,
        &iio_dev_attr_t_alarm_high.dev_attr.attr,
        &iio_dev_attr_t_alarm_low.dev_attr.attr,
-       &iio_dev_attr_t_hyst.dev_attr.attr,
-       NULL,
-};
-
-static struct attribute *adt7310_event_ct_attributes[] = {
-       &iio_dev_attr_event_mode.dev_attr.attr,
-       &iio_dev_attr_available_event_modes.dev_attr.attr,
-       &iio_dev_attr_fault_queue.dev_attr.attr,
        &iio_dev_attr_t_crit.dev_attr.attr,
        &iio_dev_attr_t_hyst.dev_attr.attr,
        NULL,
 };
 
-static struct attribute_group adt7310_event_attribute_group[ADT7310_IRQS] = {
-       {
-               .attrs = adt7310_event_int_attributes,
-               .name = "events",
-       }, {
-               .attrs = adt7310_event_ct_attributes,
-               .name = "events",
-       }
+static struct attribute_group adt7310_event_attribute_group = {
+       .attrs = adt7310_event_int_attributes,
+       .name = "events",
 };
 
 static const struct iio_info adt7310_info = {
        .attrs = &adt7310_attribute_group,
-       .event_attrs = adt7310_event_attribute_group,
+       .event_attrs = &adt7310_event_attribute_group,
        .driver_module = THIS_MODULE,
 };
 

diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c
index c62248ceb37a2d4af88806d347e699a2181f494f..dff3e8ca2d7857901a63a0b847866ff52e2cf381 100644 (file)
--- a/drivers/staging/iio/adc/adt7410.c
+++ b/drivers/staging/iio/adc/adt7410.c
@@ -693,32 +693,19 @@ static struct attribute *adt7410_event_int_attributes[] = {
        &iio_dev_attr_fault_queue.dev_attr.attr,
        &iio_dev_attr_t_alarm_high.dev_attr.attr,
        &iio_dev_attr_t_alarm_low.dev_attr.attr,
-       &iio_dev_attr_t_hyst.dev_attr.attr,
-       NULL,
-};
-
-static struct attribute *adt7410_event_ct_attributes[] = {
-       &iio_dev_attr_event_mode.dev_attr.attr,
-       &iio_dev_attr_available_event_modes.dev_attr.attr,
-       &iio_dev_attr_fault_queue.dev_attr.attr,
        &iio_dev_attr_t_crit.dev_attr.attr,
        &iio_dev_attr_t_hyst.dev_attr.attr,
        NULL,
 };
 
-static struct attribute_group adt7410_event_attribute_group[ADT7410_IRQS] = {
-       {
-               .attrs = adt7410_event_int_attributes,
-               .name = "events",
-       }, {
-               .attrs = adt7410_event_ct_attributes,
-               .name = "events",
-       }
+static struct attribute_group adt7410_event_attribute_group = {
+       .attrs = adt7410_event_int_attributes,
+       .name = "events",
 };
 
 static const struct iio_info adt7410_info = {
        .attrs = &adt7410_attribute_group,
-       .event_attrs = adt7410_event_attribute_group,
+       .event_attrs = &adt7410_event_attribute_group,
        .driver_module = THIS_MODULE,
 };