Skip to contentSkip to conversation

iio:trigger: Convert to use ATTRIBUTE_GROUPS

PATCH In review Axel Lin 2 participants 2 messages Dec 2, 2013 IIO

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 iio:trigger: Convert to use ATTRIBUTE_GROUPS

Use new ATTRIBUTE_GROUPS macro to declare attribute groups.

---
 drivers/iio/industrialio-trigger.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/iio/industrialio-trigger.c +2 -10
index 7ba2f00..766fab2 100644
@@ -55,15 +55,7 @@ static struct attribute *iio_trig_dev_attrs[] = {
 	&dev_attr_name.attr,
 	NULL,
 };
-
-static struct attribute_group iio_trig_attr_group = {
-	.attrs	= iio_trig_dev_attrs,
-};
-
-static const struct attribute_group *iio_trig_attr_groups[] = {
-	&iio_trig_attr_group,
-	NULL
-};
+ATTRIBUTE_GROUPS(iio_trig_dev);
 
 int iio_trigger_register(struct iio_trigger *trig_info)
 {
@@ -403,7 +395,7 @@ static void iio_trig_release(struct device *device)
 
 static struct device_type iio_trig_type = {
 	.release = iio_trig_release,
-	.groups = iio_trig_attr_groups,
+	.groups = iio_trig_dev_groups,
 };
 
 static void iio_trig_subirqmask(struct irq_data *d)
Signature · 1 line
1.8.1.2
maintainer
#1 lore raw
Quoted 3 lines · Axel Lin

Use new ATTRIBUTE_GROUPS macro to declare attribute groups.

Applied to the testing (and soon togreg) branch of iio.git

Thanks

Quoted 35 lines
---
 drivers/iio/industrialio-trigger.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/iio/industrialio-trigger.c +2 -10
index 7ba2f00..766fab2 100644
@@ -55,15 +55,7 @@ static struct attribute *iio_trig_dev_attrs[] = {
 	&dev_attr_name.attr,
 	NULL,
 };
-
-static struct attribute_group iio_trig_attr_group = {
-	.attrs	= iio_trig_dev_attrs,
-};
-
-static const struct attribute_group *iio_trig_attr_groups[] = {
-	&iio_trig_attr_group,
-	NULL
-};
+ATTRIBUTE_GROUPS(iio_trig_dev);
 
 int iio_trigger_register(struct iio_trigger *trig_info)
 {
@@ -403,7 +395,7 @@ static void iio_trig_release(struct device *device)
 
 static struct device_type iio_trig_type = {
 	.release = iio_trig_release,
-	.groups = iio_trig_attr_groups,
+	.groups = iio_trig_dev_groups,
 };
 
 static void iio_trig_subirqmask(struct irq_data *d)