common: remove unuseful functions

Change-Id: I47dd2ac0cde4a5acb2d0d6a2ac4bf39c9af00aa2

diff --git a/src/tdm.c b/src/tdm.c
index b2e2c35..bdb2a87 100644 (file)
--- a/src/tdm.c
+++ b/src/tdm.c
@@ -658,7 +658,6 @@ EXTERN tdm_error
 tdm_display_update(tdm_display *dpy)
 {
        TDM_RETURN_VAL_IF_FAIL(dpy != NULL, TDM_ERROR_INVALID_PARAMETER);
-       TDM_RETURN_VAL_IF_FAIL(tdm_display_is_valid(dpy), TDM_ERROR_INVALID_PARAMETER);
 
        TDM_DEPRECATED(NULL);
 
@@ -1130,8 +1129,6 @@ tdm_display_deinit(tdm_display *dpy)
        if (!private_display)
                return;
 
-       TDM_RETURN_IF_FAIL(tdm_display_is_valid(dpy));
-
        pthread_mutex_lock(&gLock);
 
        private_display->init_count--;
@@ -1188,28 +1185,3 @@ tdm_display_get(void)
        return g_private_display;
 }
 
-INTERN int
-tdm_display_is_valid(tdm_display *dpy)
-{
-       if (dpy != NULL && dpy == g_private_display)
-               return 1;
-       return 0;
-}
-
-INTERN int
-tdm_output_is_valid(tdm_output *output)
-{
-       tdm_private_module *b = NULL;
-       tdm_private_output *o = NULL;
-
-       if (!output || !g_private_display)
-               return 0;
-
-       LIST_FOR_EACH_ENTRY(b, &g_private_display->module_list, link) {
-               LIST_FOR_EACH_ENTRY(o, &b->output_list, link)
-                       if (o == output)
-                               return 1;
-       }
-
-       return 0;
-}

diff --git a/src/tdm_display.c b/src/tdm_display.c
index d9741a4..d2fcde4 100644 (file)
--- a/src/tdm_display.c
+++ b/src/tdm_display.c
@@ -45,14 +45,12 @@
        tdm_private_display *private_display; \
        tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
        TDM_RETURN_VAL_IF_FAIL(dpy != NULL, TDM_ERROR_INVALID_PARAMETER); \
-       TDM_RETURN_VAL_IF_FAIL(tdm_display_is_valid(dpy), TDM_ERROR_INVALID_PARAMETER); \
        private_display = (tdm_private_display*)dpy;
 
 #define DISPLAY_FUNC_ENTRY_ERROR() \
        tdm_private_display *private_display; \
        tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
        TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(dpy != NULL, TDM_ERROR_INVALID_PARAMETER, NULL); \
-       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_display_is_valid(dpy), TDM_ERROR_INVALID_PARAMETER, NULL); \
        private_display = (tdm_private_display*)dpy;
 
 #define BACKEND_FUNC_ENTRY() \

diff --git a/src/tdm_output.c b/src/tdm_output.c
index a8b5065..b66c27b 100644 (file)
--- a/src/tdm_output.c
+++ b/src/tdm_output.c
@@ -45,7 +45,7 @@
        tdm_private_display *private_display; \
        tdm_private_output *private_output; \
        tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
-       TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER); \
+       TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER); \
        private_output = (tdm_private_output*)output; \
        private_display = private_output->private_display
 
@@ -53,7 +53,7 @@
        tdm_private_display *private_display; \
        tdm_private_output *private_output; \
        tdm_error ret = TDM_ERROR_NONE; /* default TDM_ERROR_NONE */\
-       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER, NULL); \
+       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(output != NULL, TDM_ERROR_INVALID_PARAMETER, NULL); \
        private_output = (tdm_private_output*)output; \
        private_display = private_output->private_display
 
@@ -404,7 +404,7 @@ tdm_output_remove_change_handler(tdm_output *output,
        tdm_private_output *private_output;
        tdm_private_output_change_handler *change_handler = NULL, *hh = NULL;
 
-       TDM_RETURN_IF_FAIL(tdm_output_is_valid(output));
+       TDM_RETURN_IF_FAIL(output != NULL);
        TDM_RETURN_IF_FAIL(func != NULL);
 
        private_output = (tdm_private_output*)output;
@@ -1112,7 +1112,7 @@ tdm_output_commit_internal(tdm_output *output, int sync, tdm_output_commit_handl
        tdm_output_dpms dpms_value = TDM_OUTPUT_DPMS_ON;
        tdm_error ret = TDM_ERROR_NONE;
 
-       TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER);
+       TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER);
 
        private_output = (tdm_private_output*)output;
        private_module = private_output->private_module;
@@ -1467,7 +1467,7 @@ tdm_output_get_dpms_internal(tdm_output *output, tdm_output_dpms *dpms_value)
        tdm_func_output *func_output;
        tdm_error ret = TDM_ERROR_NONE;
 
-       TDM_RETURN_VAL_IF_FAIL(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER);
+       TDM_RETURN_VAL_IF_FAIL(output != NULL, TDM_ERROR_INVALID_PARAMETER);
 
        private_output = (tdm_private_output*)output;
 

diff --git a/src/tdm_private.h b/src/tdm_private.h
index 2d60eb7..9b1951d 100644 (file)
--- a/src/tdm_private.h
+++ b/src/tdm_private.h
@@ -82,8 +82,6 @@ extern int tdm_debug_dump;
 extern int tdm_ttrace_module;
 extern int tdm_ttrace_output;
 
-int
-tdm_display_is_valid(tdm_display *display);
 tdm_private_display *
 tdm_display_get(void);
 
@@ -97,8 +95,6 @@ tdm_display_find_private_output(tdm_private_display *private_display, tdm_output
 
 tdm_error
 tdm_output_init(tdm_private_display *private_display);
-int
-tdm_output_is_valid(tdm_output *output);
 
 void
 tdm_output_thread_cb_change(tdm_private_display *private_display, void *object, tdm_thread_cb_base *cb_base, void *user_data);

diff --git a/src/tdm_vblank.c b/src/tdm_vblank.c
index 4bfa556..b461a5b 100644 (file)
--- a/src/tdm_vblank.c
+++ b/src/tdm_vblank.c
@@ -732,8 +732,8 @@ tdm_vblank_create(tdm_display *dpy, tdm_output *output, tdm_error *error)
        tdm_private_vblank *private_vblank;
        tdm_error ret;
 
-       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_display_is_valid(dpy), TDM_ERROR_INVALID_PARAMETER, NULL);
-       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(tdm_output_is_valid(output), TDM_ERROR_INVALID_PARAMETER, NULL);
+       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(dpy != NULL, TDM_ERROR_INVALID_PARAMETER, NULL);
+       TDM_RETURN_VAL_IF_FAIL_WITH_ERROR(output != NULL, TDM_ERROR_INVALID_PARAMETER, NULL);
 
        if (error)
                *error = TDM_ERROR_NONE;