From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 25 Mar 2015 12:47:17 +0000 (+0100)
Subject: drivers/base/node: clean up attribute group conversion
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ca7ec40f42a13c6966fb3a5d8713e895d58c728;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

drivers/base/node: clean up attribute group conversion

We can use the ATTRIBUTE_GROUPS() macro here, so use it, saving some
lines of code.

Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org
---

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 06dce51e42e7..6356866167af 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -209,15 +209,7 @@ static struct attribute *node_dev_attrs[] = {
 	&dev_attr_vmstat.attr,
 	NULL
 };
-
-static struct attribute_group node_dev_attr_group = {
-	.attrs	= node_dev_attrs,
-};
-
-static const struct attribute_group *node_dev_attr_groups[] = {
-	&node_dev_attr_group,
-	NULL
-};
+ATTRIBUTE_GROUPS(node_dev);
 
 #ifdef CONFIG_HUGETLBFS
 /*
@@ -292,7 +284,7 @@ static int register_node(struct node *node, int num, struct node *parent)
 	node->dev.id = num;
 	node->dev.bus = &node_subsys;
 	node->dev.release = node_device_release;
-	node->dev.groups = node_dev_attr_groups;
+	node->dev.groups = node_dev_groups;
 	error = device_register(&node->dev);
 
 	if (!error){