[PATCH] ALSA: hda: allocate nodes with tree

[Rosen Penev]

Use a flexible array member to combine allocations. Simplifies
allocation and freeing.

Signed-off-by: Rosen Penev <rosenp@xxxxxxxxx>
---
 sound/hda/core/sysfs.c | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/sound/hda/core/sysfs.c b/sound/hda/core/sysfs.c
index 3e102538e058..f14ce1203a9f 100644
--- a/sound/hda/core/sysfs.c
+++ b/sound/hda/core/sysfs.c
@@ -13,7 +13,7 @@
 struct hdac_widget_tree {
 	struct kobject *root;
 	struct kobject *afg;
-	struct kobject **nodes;
+	struct kobject *nodes[];
 };
 
 #define CODEC_ATTR(type)					\
@@ -325,11 +325,8 @@ static void widget_tree_free(struct hdac_device *codec)
 	if (!tree)
 		return;
 	free_widget_node(tree->afg, &widget_afg_group);
-	if (tree->nodes) {
-		for (p = tree->nodes; *p; p++)
-			free_widget_node(*p, &widget_node_group);
-		kfree(tree->nodes);
-	}
+	for (p = tree->nodes; *p; p++)
+		free_widget_node(*p, &widget_node_group);
 	kobject_put(tree->root);
 	kfree(tree);
 	codec->widgets = NULL;
@@ -366,7 +363,7 @@ static int widget_tree_create(struct hdac_device *codec)
 	int i, err;
 	hda_nid_t nid;
 
-	tree = codec->widgets = kzalloc_obj(*tree);
+	tree = codec->widgets = kzalloc_flex(*tree, nodes, codec->num_nodes + 1);
 	if (!tree)
 		return -ENOMEM;
 
@@ -374,10 +371,6 @@ static int widget_tree_create(struct hdac_device *codec)
 	if (!tree->root)
 		return -ENOMEM;
 
-	tree->nodes = kzalloc_objs(*tree->nodes, codec->num_nodes + 1);
-	if (!tree->nodes)
-		return -ENOMEM;
-
 	for (i = 0, nid = codec->start_nid; i < codec->num_nodes; i++, nid++) {
 		err = add_widget_node(tree->root, nid, &widget_node_group,
 				      &tree->nodes[i]);
@@ -435,12 +428,6 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec,
 	if (!tree)
 		return -ENOMEM;
 
-	tree->nodes = kzalloc_objs(*tree->nodes, num_nodes + 1);
-	if (!tree->nodes) {
-		kfree(tree);
-		return -ENOMEM;
-	}
-
 	/* prune non-existing nodes */
 	for (i = 0, nid = codec->start_nid; i < codec->num_nodes; i++, nid++) {
 		if (nid < start_nid || nid >= end_nid)
@@ -459,7 +446,6 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec,
 	}
 
 	/* replace with the new tree */
-	kfree(codec->widgets->nodes);
 	kfree(codec->widgets);
 	codec->widgets = tree;
 
-- 
2.54.0