diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c
index 9a1e875b1..144d64254 100644
--- a/app/iscsi_tgt/iscsi_tgt.c
+++ b/app/iscsi_tgt/iscsi_tgt.c
@@ -90,7 +90,7 @@ int
 main(int argc, char **argv)
 {
 	int ch;
-	int rc, app_rc;
+	int rc;
 	int daemon_mode = 0;
 	struct spdk_app_opts opts = {};
 	enum spdk_log_level print_level = SPDK_LOG_NOTICE;
@@ -179,9 +179,9 @@ main(int argc, char **argv)
 
 	printf("Using net framework %s\n", spdk_net_framework_get_name());
 	/* Blocks until the application is exiting */
-	app_rc = spdk_app_start(&opts, spdk_startup, NULL, NULL);
+	rc = spdk_app_start(&opts, spdk_startup, NULL, NULL);
 
-	rc = spdk_app_fini();
+	spdk_app_fini();
 
-	return app_rc ? app_rc : rc;
+	return rc;
 }
diff --git a/include/spdk/event.h b/include/spdk/event.h
index 65281b985..136d480ba 100644
--- a/include/spdk/event.h
+++ b/include/spdk/event.h
@@ -105,7 +105,7 @@ int spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn,
 /**
  * \brief Perform final shutdown operations on an application using the event framework.
  */
-int spdk_app_fini(void);
+void spdk_app_fini(void);
 
 /**
  * \brief Start shutting down the framework.  Typically this function is not called directly, and
diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h
index a84552c49..29a3b0383 100644
--- a/include/spdk_internal/event.h
+++ b/include/spdk_internal/event.h
@@ -46,7 +46,7 @@ struct spdk_event {
 };
 
 int spdk_reactors_init(unsigned int max_delay_us);
-int spdk_reactors_fini(void);
+void spdk_reactors_fini(void);
 
 void spdk_reactors_start(void);
 void spdk_reactors_stop(void);
diff --git a/lib/event/app.c b/lib/event/app.c
index 7637cb84e..094f46149 100644
--- a/lib/event/app.c
+++ b/lib/event/app.c
@@ -388,18 +388,14 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn,
 	return g_spdk_app.rc;
 }
 
-int
+void
 spdk_app_fini(void)
 {
-	int rc;
-
-	rc = spdk_subsystem_fini();
+	spdk_subsystem_fini();
 	spdk_trace_cleanup();
 	spdk_reactors_fini();
 	spdk_conf_free(g_spdk_app.config);
 	spdk_log_close();
-
-	return rc;
 }
 
 void
diff --git a/lib/event/reactor.c b/lib/event/reactor.c
index 7918a52b4..10549b150 100644
--- a/lib/event/reactor.c
+++ b/lib/event/reactor.c
@@ -656,7 +656,7 @@ spdk_reactors_init(unsigned int max_delay_us)
 	return 0;
 }
 
-int
+void
 spdk_reactors_fini(void)
 {
 	uint32_t i;
@@ -674,8 +674,6 @@ spdk_reactors_fini(void)
 			spdk_mempool_free(g_spdk_event_mempool[i]);
 		}
 	}
-
-	return 0;
 }
 
 static void
diff --git a/test/app/bdev_svc/bdev_svc.c b/test/app/bdev_svc/bdev_svc.c
index 4e2543107..671f43931 100644
--- a/test/app/bdev_svc/bdev_svc.c
+++ b/test/app/bdev_svc/bdev_svc.c
@@ -123,9 +123,9 @@ main(int argc, char **argv)
 	opts.shutdown_cb = bdev_svc_shutdown;
 	opts.max_delay_us = 1000 * 1000;
 
-	spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id, NULL);
+	rc = spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id, NULL);
 
-	rc = spdk_app_fini();
+	spdk_app_fini();
 
 	return rc;
 }