Remove redundant module checks and references.

This removes references that are no longer needed due to automatic
references created by module dependencies.

In addition this removes most calls to ast_module_check as they were
checking modules which are listed as dependencies.

Change-Id: I332a6e8383d4c72c8e89d988a184ab8320c4872e

1 files changed, 18 insertions, 25 deletions

diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index f750a5454..1a14ce88b 100644
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -423,7 +423,6 @@ static int unload_module(void)
 	ao2_cleanup(events.ws_server);
 	events.ws_server = NULL;
 	ast_ari_websocket_events_event_websocket_dtor();
-	stasis_app_unref();
 	return 0;
 }
 
@@ -431,35 +430,29 @@ static int load_module(void)
 {
 	int res = 0;
 
-	CHECK_ARI_MODULE_LOADED();
+	struct ast_websocket_protocol *protocol;
 
-	/* This is scoped to not conflict with CHECK_ARI_MODULE_LOADED */
-	{
-		struct ast_websocket_protocol *protocol;
-
-		if (ast_ari_websocket_events_event_websocket_init() == -1) {
-			return AST_MODULE_LOAD_DECLINE;
-		}
+	if (ast_ari_websocket_events_event_websocket_init() == -1) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
 
-		events.ws_server = ast_websocket_server_create();
-		if (!events.ws_server) {
-			ast_ari_websocket_events_event_websocket_dtor();
-			return AST_MODULE_LOAD_DECLINE;
-		}
+	events.ws_server = ast_websocket_server_create();
+	if (!events.ws_server) {
+		ast_ari_websocket_events_event_websocket_dtor();
+		return AST_MODULE_LOAD_DECLINE;
+	}
 
-		protocol = ast_websocket_sub_protocol_alloc("ari");
-		if (!protocol) {
-			ao2_ref(events.ws_server, -1);
-			events.ws_server = NULL;
-			ast_ari_websocket_events_event_websocket_dtor();
-			return AST_MODULE_LOAD_DECLINE;
-		}
-		protocol->session_attempted = ast_ari_events_event_websocket_ws_attempted_cb;
-		protocol->session_established = ast_ari_events_event_websocket_ws_established_cb;
-		res |= ast_websocket_server_add_protocol2(events.ws_server, protocol);
+	protocol = ast_websocket_sub_protocol_alloc("ari");
+	if (!protocol) {
+		ao2_ref(events.ws_server, -1);
+		events.ws_server = NULL;
+		ast_ari_websocket_events_event_websocket_dtor();
+		return AST_MODULE_LOAD_DECLINE;
 	}
+	protocol->session_attempted = ast_ari_events_event_websocket_ws_attempted_cb;
+	protocol->session_established = ast_ari_events_event_websocket_ws_established_cb;
+	res |= ast_websocket_server_add_protocol2(events.ws_server, protocol);
 
-	stasis_app_ref();
 	res |= ast_ari_add_handler(&events);
 	if (res) {
 		unload_module();