1 files changed, 0 insertions, 80 deletions

diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index fda240214cd..792b44363fd 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -85,8 +85,6 @@ int dcd_auto_register(struct dcd_manager *hdcd_mgr,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-
         if (hdcd_mgr)
                 status = dcd_get_objects(hdcd_mgr, sz_coff_path,
                                          (dcd_registerfxn) dcd_register_object,
@@ -107,8 +105,6 @@ int dcd_auto_unregister(struct dcd_manager *hdcd_mgr,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-
         if (hdcd_mgr)
                 status = dcd_get_objects(hdcd_mgr, sz_coff_path,
                                          (dcd_registerfxn) dcd_register_object,
@@ -131,9 +127,6 @@ int dcd_create_manager(char *sz_zl_dll_name,
         struct dcd_manager *dcd_mgr_obj = NULL; /* DCD Manager pointer */
         int status = 0;
 
-        DBC_REQUIRE(refs >= 0);
-        DBC_REQUIRE(dcd_mgr);
-
         status = cod_create(&cod_mgr, sz_zl_dll_name);
         if (status)
                 goto func_end;
@@ -156,9 +149,6 @@ int dcd_create_manager(char *sz_zl_dll_name,
                 cod_delete(cod_mgr);
         }
 
-        DBC_ENSURE((!status) ||
-                        ((dcd_mgr_obj == NULL) && (status == -ENOMEM)));
-
 func_end:
         return status;
 }
@@ -173,8 +163,6 @@ int dcd_destroy_manager(struct dcd_manager *hdcd_mgr)
         struct dcd_manager *dcd_mgr_obj = hdcd_mgr;
         int status = -EFAULT;
 
-        DBC_REQUIRE(refs >= 0);
-
         if (hdcd_mgr) {
                 /* Delete the COD manager. */
                 cod_delete(dcd_mgr_obj->cod_mgr);
@@ -205,10 +193,6 @@ int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
         struct dcd_key_elem *dcd_key;
         int len;
 
-        DBC_REQUIRE(refs >= 0);
-        DBC_REQUIRE(index >= 0);
-        DBC_REQUIRE(uuid_obj != NULL);
-
         if ((index != 0) && (enum_refs == 0)) {
                 /*
                  * If an enumeration is being performed on an index greater
@@ -294,8 +278,6 @@ int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
                 }
         }
 
-        DBC_ENSURE(uuid_obj || (status == -EPERM));
-
         return status;
 }
 
@@ -307,7 +289,6 @@ int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
 void dcd_exit(void)
 {
         struct dcd_key_elem *rv, *rv_tmp;
-        DBC_REQUIRE(refs > 0);
 
         refs--;
         if (refs == 0) {
@@ -319,7 +300,6 @@ void dcd_exit(void)
                 }
         }
 
-        DBC_ENSURE(refs >= 0);
 }
 
 /*
@@ -333,12 +313,6 @@ int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(hdcd_mgr);
-        DBC_REQUIRE(uuid_obj != NULL);
-        DBC_REQUIRE(dep_lib_uuids != NULL);
-        DBC_REQUIRE(prstnt_dep_libs != NULL);
-
         status =
             get_dep_lib_info(hdcd_mgr, uuid_obj, &num_libs, NULL, dep_lib_uuids,
                              prstnt_dep_libs, phase);
@@ -356,12 +330,6 @@ int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(hdcd_mgr);
-        DBC_REQUIRE(num_libs != NULL);
-        DBC_REQUIRE(num_pers_libs != NULL);
-        DBC_REQUIRE(uuid_obj != NULL);
-
         status = get_dep_lib_info(hdcd_mgr, uuid_obj, num_libs, num_pers_libs,
                                   NULL, NULL, phase);
 
@@ -393,10 +361,6 @@ int dcd_get_object_def(struct dcd_manager *hdcd_mgr,
         u32 dw_key_len;         /* Len of REG key. */
         char sz_obj_type[MAX_INT2CHAR_LENGTH];  /* str. rep. of obj_type. */
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(obj_def != NULL);
-        DBC_REQUIRE(obj_uuid != NULL);
-
         sz_uuid = kzalloc(MAXUUIDLEN, GFP_KERNEL);
         if (!sz_uuid) {
                 status = -ENOMEM;
@@ -553,7 +517,6 @@ int dcd_get_objects(struct dcd_manager *hdcd_mgr,
         struct dsp_uuid dsp_uuid_obj;
         s32 object_type;
 
-        DBC_REQUIRE(refs > 0);
         if (!hdcd_mgr) {
                 status = -EFAULT;
                 goto func_end;
@@ -663,11 +626,6 @@ int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
         int status = 0;
         struct dcd_key_elem *dcd_key = NULL;
 
-        DBC_REQUIRE(uuid_obj != NULL);
-        DBC_REQUIRE(str_lib_name != NULL);
-        DBC_REQUIRE(buff_size != NULL);
-        DBC_REQUIRE(hdcd_mgr);
-
         dev_dbg(bridge, "%s: hdcd_mgr %p, uuid_obj %p, str_lib_name %p,"
                 " buff_size %p\n", __func__, hdcd_mgr, uuid_obj, str_lib_name,
                 buff_size);
@@ -790,8 +748,6 @@ bool dcd_init(void)
         bool init_cod;
         bool ret = true;
 
-        DBC_REQUIRE(refs >= 0);
-
         if (refs == 0) {
                 /* Initialize required modules. */
                 init_cod = cod_init();
@@ -809,8 +765,6 @@ bool dcd_init(void)
         if (ret)
                 refs++;
 
-        DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs == 0)));
-
         return ret;
 }
 
@@ -832,15 +786,6 @@ int dcd_register_object(struct dsp_uuid *uuid_obj,
         char sz_obj_type[MAX_INT2CHAR_LENGTH];  /* str. rep. of obj_type. */
         struct dcd_key_elem *dcd_key = NULL;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(uuid_obj != NULL);
-        DBC_REQUIRE((obj_type == DSP_DCDNODETYPE) ||
-                    (obj_type == DSP_DCDPROCESSORTYPE) ||
-                    (obj_type == DSP_DCDLIBRARYTYPE) ||
-                    (obj_type == DSP_DCDCREATELIBTYPE) ||
-                    (obj_type == DSP_DCDEXECUTELIBTYPE) ||
-                    (obj_type == DSP_DCDDELETELIBTYPE));
-
         dev_dbg(bridge, "%s: object UUID %p, obj_type %d, szPathName %s\n",
                 __func__, uuid_obj, obj_type, psz_path_name);
 
@@ -987,15 +932,6 @@ int dcd_unregister_object(struct dsp_uuid *uuid_obj,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(uuid_obj != NULL);
-        DBC_REQUIRE((obj_type == DSP_DCDNODETYPE) ||
-                    (obj_type == DSP_DCDPROCESSORTYPE) ||
-                    (obj_type == DSP_DCDLIBRARYTYPE) ||
-                    (obj_type == DSP_DCDCREATELIBTYPE) ||
-                    (obj_type == DSP_DCDEXECUTELIBTYPE) ||
-                    (obj_type == DSP_DCDDELETELIBTYPE));
-
         /*
          *  When dcd_register_object is called with NULL as pathname,
          *  it indicates an unregister object operation.
@@ -1055,12 +991,6 @@ static int get_attrs_from_buf(char *psz_buf, u32 ul_buf_size,
         s32 entry_id;
 #endif
 
-        DBC_REQUIRE(psz_buf != NULL);
-        DBC_REQUIRE(ul_buf_size != 0);
-        DBC_REQUIRE((obj_type == DSP_DCDNODETYPE)
-                    || (obj_type == DSP_DCDPROCESSORTYPE));
-        DBC_REQUIRE(gen_obj != NULL);
-
         switch (obj_type) {
         case DSP_DCDNODETYPE:
                 /*
@@ -1082,7 +1012,6 @@ static int get_attrs_from_buf(char *psz_buf, u32 ul_buf_size,
                 token = strsep(&psz_cur, seps);
 
                 /* ac_name */
-                DBC_REQUIRE(token);
                 token_len = strlen(token);
                 if (token_len > DSP_MAXNAMELEN - 1)
                         token_len = DSP_MAXNAMELEN - 1;
@@ -1167,7 +1096,6 @@ static int get_attrs_from_buf(char *psz_buf, u32 ul_buf_size,
                 token = strsep(&psz_cur, seps);
 
                 /* char *str_create_phase_fxn */
-                DBC_REQUIRE(token);
                 token_len = strlen(token);
                 gen_obj->obj_data.node_obj.str_create_phase_fxn =
                                         kzalloc(token_len + 1, GFP_KERNEL);
@@ -1178,7 +1106,6 @@ static int get_attrs_from_buf(char *psz_buf, u32 ul_buf_size,
                 token = strsep(&psz_cur, seps);
 
                 /* char *str_execute_phase_fxn */
-                DBC_REQUIRE(token);
                 token_len = strlen(token);
                 gen_obj->obj_data.node_obj.str_execute_phase_fxn =
                                         kzalloc(token_len + 1, GFP_KERNEL);
@@ -1189,7 +1116,6 @@ static int get_attrs_from_buf(char *psz_buf, u32 ul_buf_size,
                 token = strsep(&psz_cur, seps);
 
                 /* char *str_delete_phase_fxn */
-                DBC_REQUIRE(token);
                 token_len = strlen(token);
                 gen_obj->obj_data.node_obj.str_delete_phase_fxn =
                                         kzalloc(token_len + 1, GFP_KERNEL);
@@ -1421,12 +1347,6 @@ static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
         u16 dep_libs = 0;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-
-        DBC_REQUIRE(hdcd_mgr);
-        DBC_REQUIRE(num_libs != NULL);
-        DBC_REQUIRE(uuid_obj != NULL);
-
         /*  Initialize to 0 dependent libraries, if only counting number of
          *  dependent libraries */
         if (!get_uuids) {