From 49e21ebb4a770fdd64f37543564fd5fbe222e69e Mon Sep 17 00:00:00 2001
From: Richard Acayan <mailingradian@gmail.com>
Date: Thu, 5 Jan 2023 22:08:03 -0500
Subject: [PATCH] fastrpc: rpcd: give listener registration its own function

All operations part of registering the listener are together now. Split
them into their own function so the main() function isn't too big.
---
 fastrpc/rpcd.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/fastrpc/rpcd.c b/fastrpc/rpcd.c
index 419d1b3..8e6e750 100644
--- a/fastrpc/rpcd.c
+++ b/fastrpc/rpcd.c
@@ -130,9 +130,28 @@ static void remotectl_err(const char *err)
 	fprintf(stderr, "Could not remotectl: %s\n", err);
 }
 
-int main()
+static int register_fastrpc_listener(int fd)
 {
 	struct fastrpc_context *ctx;
+	int ret;
+
+	ret = remotectl_open(fd, "adsp_default_listener", &ctx, remotectl_err);
+	if (ret)
+		return 1;
+
+	ret = adsp_default_listener_register(ctx);
+	if (ret) {
+		fprintf(stderr, "Could not register ADSP default listener\n");
+		goto err;
+	}
+
+err:
+	remotectl_close(ctx, remotectl_err);
+	return ret;
+}
+
+int main()
+{
 	struct fastrpc_init_create_static create;
 	uint32_t rctx, handle, sc;
 	uint32_t inbufs_len;
@@ -162,18 +181,10 @@ int main()
 		goto err_close_dev;
 	}
 
-	ret = remotectl_open(fd, "adsp_default_listener", &ctx, remotectl_err);
+	ret = register_fastrpc_listener(fd);
 	if (ret)
 		goto err_close_dev;
 
-	ret = adsp_default_listener_register(ctx);
-	if (ret) {
-		fprintf(stderr, "Could not register ADSP default listener\n");
-		goto err_close_handle;
-	}
-
-	remotectl_close(ctx, remotectl_err);
-
 	ret = adsp_listener_init2(fd);
 	if (ret) {
 		fprintf(stderr, "Could not initialize the listener: %u\n", ret);
@@ -190,9 +201,6 @@ int main()
 
 	return 0;
 
-err_close_handle:
-	remotectl_close(ctx, remotectl_err);
-
 err_close_dev:
 	close(fd);
 	return 1;