module_adapter: clean up module_load_config

cujomalainey · cujomalainey · commit 3a3eeaa5ffa5 · 2024-08-21T11:30:22.000-07:00
Now that validate_config has been deleted we can clean up some of the
error handling logic here.

Signed-off-by: Curtis Malainey &lt;cujomalainey@chromium.org&gt;
diff --git a/src/audio/module_adapter/module/generic.c b/src/audio/module_adapter/module/generic.c
@@ -47,8 +47,7 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
 	}
 	if (!dst->data) {
 		comp_err(dev, "module_load_config(): failed to allocate space for setup config.");
-		ret = -ENOMEM;
-		goto err;
+		return -ENOMEM;
 	}
 
 	ret = memcpy_s(dst->data, size, cfg, size);
@@ -60,11 +59,6 @@ int module_load_config(struct comp_dev *dev, const void *cfg, size_t size)
 
 	comp_dbg(dev, "module_load_config() done");
 	return ret;
-err:
-	if (dst->data)
-		rfree(dst->data);
-	dst->data = NULL;
-	return ret;
 }
 
 int module_init(struct processing_module *mod)

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ int module_load_config(struct comp_dev dev, const void cfg, size_t size)`
`47`	`47`	`}`
`48`	`48`	`if (!dst->data) {`
`49`	`49`	`comp_err(dev, "module_load_config(): failed to allocate space for setup config.");`
`50`		`- ret = -ENOMEM;`
`51`		`- goto err;`
	`50`	`+ return -ENOMEM;`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`ret = memcpy_s(dst->data, size, cfg, size);`
`@@ -60,11 +59,6 @@ int module_load_config(struct comp_dev dev, const void cfg, size_t size)`
`60`	`59`
`61`	`60`	`comp_dbg(dev, "module_load_config() done");`
`62`	`61`	`return ret;`
`63`		`-err:`
`64`		`- if (dst->data)`
`65`		`- rfree(dst->data);`
`66`		`- dst->data = NULL;`
`67`		`- return ret;`
`68`	`62`	`}`
`69`	`63`
`70`	`64`	`int module_init(struct processing_module *mod)`