staging: tidspbridge: remove DBC_ENSURE and DBC_REQUIRED

The kernel does not use a "Design by Contract" approach, and it is only
activated in the module if CONFIG_TIDSPBRDIGE_DEBUG is enabled, so they are
executed rarely. It is better to remove them: less code to maintain.

Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

9 files changed, 1 insertions, 419 deletions

diff --git a/drivers/staging/tidspbridge/pmgr/chnl.c b/drivers/staging/tidspbridge/pmgr/chnl.c
index 245de82e2d6..61ee0f0e511 100644
--- a/drivers/staging/tidspbridge/pmgr/chnl.c
+++ b/drivers/staging/tidspbridge/pmgr/chnl.c
@@ -58,10 +58,6 @@ int chnl_create(struct chnl_mgr **channel_mgr,
         struct chnl_mgr *hchnl_mgr;
         struct chnl_mgr_ *chnl_mgr_obj = NULL;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(channel_mgr != NULL);
-        DBC_REQUIRE(mgr_attrts != NULL);
-
         *channel_mgr = NULL;
 
         /* Validate args: */
@@ -99,8 +95,6 @@ int chnl_create(struct chnl_mgr **channel_mgr,
                 }
         }
 
-        DBC_ENSURE(status || chnl_mgr_obj);
-
         return status;
 }
 
@@ -115,8 +109,6 @@ int chnl_destroy(struct chnl_mgr *hchnl_mgr)
         struct bridge_drv_interface *intf_fxns;
         int status;
 
-        DBC_REQUIRE(refs > 0);
-
         if (chnl_mgr_obj) {
                 intf_fxns = chnl_mgr_obj->intf_fxns;
                 /* Let Bridge channel module destroy the chnl_mgr: */
@@ -135,11 +127,7 @@ int chnl_destroy(struct chnl_mgr *hchnl_mgr)
  */
 void chnl_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
-
         refs--;
-
-        DBC_ENSURE(refs >= 0);
 }
 
 /*
@@ -151,12 +139,8 @@ bool chnl_init(void)
 {
         bool ret = true;
 
-        DBC_REQUIRE(refs >= 0);
-
         if (ret)
                 refs++;
 
-        DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
-
         return ret;
 }
diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c
index e6b2c8962f8..2eeb5370927 100644
--- a/drivers/staging/tidspbridge/pmgr/cmm.c
+++ b/drivers/staging/tidspbridge/pmgr/cmm.c
@@ -244,9 +244,6 @@ int cmm_create(struct cmm_object **ph_cmm_mgr,
         struct cmm_object *cmm_obj = NULL;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(ph_cmm_mgr != NULL);
-
         *ph_cmm_mgr = NULL;
         /* create, zero, and tag a cmm mgr object */
         cmm_obj = kzalloc(sizeof(struct cmm_object), GFP_KERNEL);
@@ -283,7 +280,6 @@ int cmm_destroy(struct cmm_object *hcmm_mgr, bool force)
         s32 slot_seg;
         struct cmm_mnode *node, *tmp;
 
-        DBC_REQUIRE(refs > 0);
         if (!hcmm_mgr) {
                 status = -EFAULT;
                 return status;
@@ -333,8 +329,6 @@ int cmm_destroy(struct cmm_object *hcmm_mgr, bool force)
  */
 void cmm_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
-
         refs--;
 }
 
@@ -351,9 +345,6 @@ int cmm_free_buf(struct cmm_object *hcmm_mgr, void *buf_pa, u32 ul_seg_id)
         struct cmm_allocator *allocator;
         struct cmm_attrs *pattrs;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(buf_pa != NULL);
-
         if (ul_seg_id == 0) {
                 pattrs = &cmm_dfltalctattrs;
                 ul_seg_id = pattrs->seg_id;
@@ -392,8 +383,6 @@ int cmm_get_handle(void *hprocessor, struct cmm_object ** ph_cmm_mgr)
         int status = 0;
         struct dev_object *hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(ph_cmm_mgr != NULL);
         if (hprocessor != NULL)
                 status = proc_get_dev_object(hprocessor, &hdev_obj);
         else
@@ -419,8 +408,6 @@ int cmm_get_info(struct cmm_object *hcmm_mgr,
         struct cmm_allocator *altr;
         struct cmm_mnode *curr;
 
-        DBC_REQUIRE(cmm_info_obj != NULL);
-
         if (!hcmm_mgr) {
                 status = -EFAULT;
                 return status;
@@ -472,12 +459,9 @@ bool cmm_init(void)
 {
         bool ret = true;
 
-        DBC_REQUIRE(refs >= 0);
         if (ret)
                 refs++;
 
-        DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
-
         return ret;
 }
 
@@ -499,13 +483,6 @@ int cmm_register_gppsm_seg(struct cmm_object *hcmm_mgr,
         struct cmm_mnode *new_node;
         s32 slot_seg;
 
-        DBC_REQUIRE(ul_size > 0);
-        DBC_REQUIRE(sgmt_id != NULL);
-        DBC_REQUIRE(dw_gpp_base_pa != 0);
-        DBC_REQUIRE(gpp_base_va != 0);
-        DBC_REQUIRE((c_factor <= CMM_ADDTODSPPA) &&
-                        (c_factor >= CMM_SUBFROMDSPPA));
-
         dev_dbg(bridge, "%s: dw_gpp_base_pa %x ul_size %x dsp_addr_offset %x "
                         "dw_dsp_base %x ul_dsp_size %x gpp_base_va %x\n",
                         __func__, dw_gpp_base_pa, ul_size, dsp_addr_offset,
@@ -589,7 +566,6 @@ int cmm_un_register_gppsm_seg(struct cmm_object *hcmm_mgr,
         struct cmm_allocator *psma;
         u32 ul_id = ul_seg_id;
 
-        DBC_REQUIRE(ul_seg_id > 0);
         if (!hcmm_mgr)
                 return -EFAULT;
 
@@ -635,8 +611,6 @@ static void un_register_gppsm_seg(struct cmm_allocator *psma)
 {
         struct cmm_mnode *curr, *tmp;
 
-        DBC_REQUIRE(psma != NULL);
-
         /* free nodes on free list */
         list_for_each_entry_safe(curr, tmp, &psma->free_list, link) {
                 list_del(&curr->link);
@@ -664,7 +638,6 @@ static void un_register_gppsm_seg(struct cmm_allocator *psma)
 static s32 get_slot(struct cmm_object *cmm_mgr_obj)
 {
         s32 slot_seg = -1;      /* neg on failure */
-        DBC_REQUIRE(cmm_mgr_obj != NULL);
         /* get first available slot in cmm mgr SMSegTab[] */
         for (slot_seg = 0; slot_seg < CMM_MAXGPPSEGS; slot_seg++) {
                 if (cmm_mgr_obj->pa_gppsm_seg_tab[slot_seg] == NULL)
@@ -687,11 +660,6 @@ static struct cmm_mnode *get_node(struct cmm_object *cmm_mgr_obj, u32 dw_pa,
 {
         struct cmm_mnode *pnode;
 
-        DBC_REQUIRE(cmm_mgr_obj != NULL);
-        DBC_REQUIRE(dw_pa != 0);
-        DBC_REQUIRE(dw_va != 0);
-        DBC_REQUIRE(ul_size != 0);
-
         /* Check cmm mgr's node freelist */
         if (list_empty(&cmm_mgr_obj->node_free_list)) {
                 pnode = kzalloc(sizeof(struct cmm_mnode), GFP_KERNEL);
@@ -719,7 +687,6 @@ static struct cmm_mnode *get_node(struct cmm_object *cmm_mgr_obj, u32 dw_pa,
  */
 static void delete_node(struct cmm_object *cmm_mgr_obj, struct cmm_mnode *pnode)
 {
-        DBC_REQUIRE(pnode != NULL);
         list_add_tail(&pnode->link, &cmm_mgr_obj->node_free_list);
 }
 
@@ -794,9 +761,6 @@ static void add_to_free_list(struct cmm_allocator *allocator,
 static struct cmm_allocator *get_allocator(struct cmm_object *cmm_mgr_obj,
                                            u32 ul_seg_id)
 {
-        DBC_REQUIRE(cmm_mgr_obj != NULL);
-        DBC_REQUIRE((ul_seg_id > 0) && (ul_seg_id <= CMM_MAXGPPSEGS));
-
         return cmm_mgr_obj->pa_gppsm_seg_tab[ul_seg_id - 1];
 }
 
@@ -818,10 +782,6 @@ int cmm_xlator_create(struct cmm_xlatorobject **xlator,
         struct cmm_xlator *xlator_object = NULL;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(xlator != NULL);
-        DBC_REQUIRE(hcmm_mgr != NULL);
-
         *xlator = NULL;
         if (xlator_attrs == NULL)
                 xlator_attrs = &cmm_dfltxlatorattrs;    /* set defaults */
@@ -851,13 +811,6 @@ void *cmm_xlator_alloc_buf(struct cmm_xlatorobject *xlator, void *va_buf,
         void *tmp_va_buff;
         struct cmm_attrs attrs;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(xlator != NULL);
-        DBC_REQUIRE(xlator_obj->cmm_mgr != NULL);
-        DBC_REQUIRE(va_buf != NULL);
-        DBC_REQUIRE(pa_size > 0);
-        DBC_REQUIRE(xlator_obj->seg_id > 0);
-
         if (xlator_obj) {
                 attrs.seg_id = xlator_obj->seg_id;
                 __raw_writel(0, va_buf);
@@ -887,10 +840,6 @@ int cmm_xlator_free_buf(struct cmm_xlatorobject *xlator, void *buf_va)
         int status = -EPERM;
         void *buf_pa = NULL;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(buf_va != NULL);
-        DBC_REQUIRE(xlator_obj->seg_id > 0);
-
         if (xlator_obj) {
                 /* convert Va to Pa so we can free it. */
                 buf_pa = cmm_xlator_translate(xlator, buf_va, CMM_VA2PA);
@@ -918,10 +867,6 @@ int cmm_xlator_info(struct cmm_xlatorobject *xlator, u8 ** paddr,
         struct cmm_xlator *xlator_obj = (struct cmm_xlator *)xlator;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(paddr != NULL);
-        DBC_REQUIRE((segm_id > 0) && (segm_id <= CMM_MAXGPPSEGS));
-
         if (xlator_obj) {
                 if (set_info) {
                         /* set translators virtual address range */
@@ -948,10 +893,6 @@ void *cmm_xlator_translate(struct cmm_xlatorobject *xlator, void *paddr,
         struct cmm_allocator *allocator = NULL;
         u32 dw_offset = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(paddr != NULL);
-        DBC_REQUIRE((xtype >= CMM_VA2PA) && (xtype <= CMM_DSPPA2PA));
-
         if (!xlator_obj)
                 goto loop_cont;
 
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index 1a29264b585..be7c7772521 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -183,10 +183,6 @@ void cod_close(struct cod_libraryobj *lib)
 {
         struct cod_manager *hmgr;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(lib != NULL);
-        DBC_REQUIRE(lib->cod_mgr);
-
         hmgr = lib->cod_mgr;
         hmgr->fxns.close_fxn(lib->dbll_lib);
 
@@ -208,9 +204,6 @@ int cod_create(struct cod_manager **mgr, char *str_zl_file)
         struct dbll_attrs zl_attrs;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(mgr != NULL);
-
         /* assume failure */
         *mgr = NULL;
 
@@ -263,9 +256,6 @@ int cod_create(struct cod_manager **mgr, char *str_zl_file)
  */
 void cod_delete(struct cod_manager *cod_mgr_obj)
 {
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr_obj);
-
         if (cod_mgr_obj->base_lib) {
                 if (cod_mgr_obj->loaded)
                         cod_mgr_obj->fxns.unload_fxn(cod_mgr_obj->base_lib,
@@ -288,11 +278,7 @@ void cod_delete(struct cod_manager *cod_mgr_obj)
  */
 void cod_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
-
         refs--;
-
-        DBC_ENSURE(refs >= 0);
 }
 
 /*
@@ -305,10 +291,6 @@ int cod_get_base_lib(struct cod_manager *cod_mgr_obj,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr_obj);
-        DBC_REQUIRE(plib != NULL);
-
         *plib = (struct dbll_library_obj *)cod_mgr_obj->base_lib;
 
         return status;
@@ -322,10 +304,6 @@ int cod_get_base_name(struct cod_manager *cod_mgr_obj, char *sz_name,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr_obj);
-        DBC_REQUIRE(sz_name != NULL);
-
         if (usize <= COD_MAXPATHLENGTH)
                 strncpy(sz_name, cod_mgr_obj->sz_zl_file, usize);
         else
@@ -342,10 +320,6 @@ int cod_get_base_name(struct cod_manager *cod_mgr_obj, char *sz_name,
  */
 int cod_get_entry(struct cod_manager *cod_mgr_obj, u32 *entry_pt)
 {
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr_obj);
-        DBC_REQUIRE(entry_pt != NULL);
-
         *entry_pt = cod_mgr_obj->entry;
 
         return 0;
@@ -361,10 +335,6 @@ int cod_get_loader(struct cod_manager *cod_mgr_obj,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr_obj);
-        DBC_REQUIRE(loader != NULL);
-
         *loader = (struct dbll_tar_obj *)cod_mgr_obj->target;
 
         return status;
@@ -382,13 +352,6 @@ int cod_get_section(struct cod_libraryobj *lib, char *str_sect,
         struct cod_manager *cod_mgr_obj;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(lib != NULL);
-        DBC_REQUIRE(lib->cod_mgr);
-        DBC_REQUIRE(str_sect != NULL);
-        DBC_REQUIRE(addr != NULL);
-        DBC_REQUIRE(len != NULL);
-
         *addr = 0;
         *len = 0;
         if (lib != NULL) {
@@ -399,8 +362,6 @@ int cod_get_section(struct cod_libraryobj *lib, char *str_sect,
                 status = -ESPIPE;
         }
 
-        DBC_ENSURE(!status || ((*addr == 0) && (*len == 0)));
-
         return status;
 }
 
@@ -417,11 +378,6 @@ int cod_get_sym_value(struct cod_manager *cod_mgr_obj, char *str_sym,
 {
         struct dbll_sym_val *dbll_sym;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr_obj);
-        DBC_REQUIRE(str_sym != NULL);
-        DBC_REQUIRE(pul_value != NULL);
-
         dev_dbg(bridge, "%s: cod_mgr_obj: %p str_sym: %s pul_value: %p\n",
                 __func__, cod_mgr_obj, str_sym, pul_value);
         if (cod_mgr_obj->base_lib) {
@@ -451,12 +407,9 @@ bool cod_init(void)
 {
         bool ret = true;
 
-        DBC_REQUIRE(refs >= 0);
-
         if (ret)
                 refs++;
 
-        DBC_ENSURE((ret && refs > 0) || (!ret && refs >= 0));
         return ret;
 }
 
@@ -482,14 +435,6 @@ int cod_load_base(struct cod_manager *cod_mgr_obj, u32 num_argc, char *args[],
         int status;
         u32 i;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr_obj);
-        DBC_REQUIRE(num_argc > 0);
-        DBC_REQUIRE(args != NULL);
-        DBC_REQUIRE(args[0] != NULL);
-        DBC_REQUIRE(pfn_write != NULL);
-        DBC_REQUIRE(cod_mgr_obj->base_lib != NULL);
-
         /*
          *  Make sure every argv[] stated in argc has a value, or change argc to
          *  reflect true number in NULL terminated argv array.
@@ -538,12 +483,6 @@ int cod_open(struct cod_manager *hmgr, char *sz_coff_path,
         int status = 0;
         struct cod_libraryobj *lib = NULL;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(hmgr);
-        DBC_REQUIRE(sz_coff_path != NULL);
-        DBC_REQUIRE(flags == COD_NOLOAD || flags == COD_SYMB);
-        DBC_REQUIRE(lib_obj != NULL);
-
         *lib_obj = NULL;
 
         lib = kzalloc(sizeof(struct cod_libraryobj), GFP_KERNEL);
@@ -575,10 +514,6 @@ int cod_open_base(struct cod_manager *hmgr, char *sz_coff_path,
         int status = 0;
         struct dbll_library_obj *lib;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(hmgr);
-        DBC_REQUIRE(sz_coff_path != NULL);
-
         /* if we previously opened a base image, close it now */
         if (hmgr->base_lib) {
                 if (hmgr->loaded) {
@@ -612,12 +547,6 @@ int cod_read_section(struct cod_libraryobj *lib, char *str_sect,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(lib != NULL);
-        DBC_REQUIRE(lib->cod_mgr);
-        DBC_REQUIRE(str_sect != NULL);
-        DBC_REQUIRE(str_content != NULL);
-
         if (lib != NULL)
                 status =
                     lib->cod_mgr->fxns.read_sect_fxn(lib->dbll_lib, str_sect,
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c
index 31da62b14bc..db1af795544 100644
--- a/drivers/staging/tidspbridge/pmgr/dbll.c
+++ b/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -202,9 +202,6 @@ void dbll_close(struct dbll_library_obj *zl_lib)
 {
         struct dbll_tar_obj *zl_target;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_lib);
-        DBC_REQUIRE(zl_lib->open_ref > 0);
         zl_target = zl_lib->target_obj;
         zl_lib->open_ref--;
         if (zl_lib->open_ref == 0) {
@@ -241,10 +238,6 @@ int dbll_create(struct dbll_tar_obj **target_obj,
         struct dbll_tar_obj *pzl_target;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(pattrs != NULL);
-        DBC_REQUIRE(target_obj != NULL);
-
         /* Allocate DBL target object */
         pzl_target = kzalloc(sizeof(struct dbll_tar_obj), GFP_KERNEL);
         if (target_obj != NULL) {
@@ -255,8 +248,6 @@ int dbll_create(struct dbll_tar_obj **target_obj,
                         pzl_target->attrs = *pattrs;
                         *target_obj = (struct dbll_tar_obj *)pzl_target;
                 }
-                DBC_ENSURE((!status && *target_obj) ||
-                                (status && *target_obj == NULL));
         }
 
         return status;
@@ -269,9 +260,6 @@ void dbll_delete(struct dbll_tar_obj *target)
 {
         struct dbll_tar_obj *zl_target = (struct dbll_tar_obj *)target;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_target);
-
         kfree(zl_target);
 
 }
@@ -282,14 +270,10 @@ void dbll_delete(struct dbll_tar_obj *target)
  */
 void dbll_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
-
         refs--;
 
         if (refs == 0)
                 gh_exit();
-
-        DBC_ENSURE(refs >= 0);
 }
 
 /*
@@ -302,12 +286,6 @@ bool dbll_get_addr(struct dbll_library_obj *zl_lib, char *name,
         struct dbll_symbol *sym;
         bool status = false;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_lib);
-        DBC_REQUIRE(name != NULL);
-        DBC_REQUIRE(sym_val != NULL);
-        DBC_REQUIRE(zl_lib->sym_tab != NULL);
-
         sym = (struct dbll_symbol *)gh_find(zl_lib->sym_tab, name);
         if (sym != NULL) {
                 *sym_val = &sym->value;
@@ -327,10 +305,6 @@ void dbll_get_attrs(struct dbll_tar_obj *target, struct dbll_attrs *pattrs)
 {
         struct dbll_tar_obj *zl_target = (struct dbll_tar_obj *)target;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_target);
-        DBC_REQUIRE(pattrs != NULL);
-
         if ((pattrs != NULL) && (zl_target != NULL))
                 *pattrs = zl_target->attrs;
 
@@ -347,12 +321,6 @@ bool dbll_get_c_addr(struct dbll_library_obj *zl_lib, char *name,
         char cname[MAXEXPR + 1];
         bool status = false;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_lib);
-        DBC_REQUIRE(sym_val != NULL);
-        DBC_REQUIRE(zl_lib->sym_tab != NULL);
-        DBC_REQUIRE(name != NULL);
-
         cname[0] = '_';
 
         strncpy(cname + 1, name, sizeof(cname) - 2);
@@ -382,12 +350,6 @@ int dbll_get_sect(struct dbll_library_obj *lib, char *name, u32 *paddr,
         struct dbll_library_obj *zl_lib = (struct dbll_library_obj *)lib;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(name != NULL);
-        DBC_REQUIRE(paddr != NULL);
-        DBC_REQUIRE(psize != NULL);
-        DBC_REQUIRE(zl_lib);
-
         /* If DOFF file is not open, we open it. */
         if (zl_lib != NULL) {
                 if (zl_lib->fp == NULL) {
@@ -434,8 +396,6 @@ int dbll_get_sect(struct dbll_library_obj *lib, char *name, u32 *paddr,
  */
 bool dbll_init(void)
 {
-        DBC_REQUIRE(refs >= 0);
-
         if (refs == 0)
                 gh_init();
 
@@ -456,10 +416,6 @@ int dbll_load(struct dbll_library_obj *lib, dbll_flags flags,
         s32 err;
         int status = 0;
         bool opened_doff = false;
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_lib);
-        DBC_REQUIRE(entry != NULL);
-        DBC_REQUIRE(attrs != NULL);
 
         /*
          *  Load if not already loaded.
@@ -558,8 +514,6 @@ int dbll_load(struct dbll_library_obj *lib, dbll_flags flags,
         if (opened_doff)
                 dof_close(zl_lib);
 
-        DBC_ENSURE(status || zl_lib->load_ref > 0);
-
         dev_dbg(bridge, "%s: lib: %p flags: 0x%x entry: %p, status 0x%x\n",
                 __func__, lib, flags, entry, status);
 
@@ -577,12 +531,6 @@ int dbll_open(struct dbll_tar_obj *target, char *file, dbll_flags flags,
         s32 err;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_target);
-        DBC_REQUIRE(zl_target->attrs.fopen != NULL);
-        DBC_REQUIRE(file != NULL);
-        DBC_REQUIRE(lib_obj != NULL);
-
         zl_lib = zl_target->head;
         while (zl_lib != NULL) {
                 if (strcmp(zl_lib->file_name, file) == 0) {
@@ -699,8 +647,6 @@ func_cont:
                         dbll_close((struct dbll_library_obj *)zl_lib);
 
         }
-        DBC_ENSURE((!status && (zl_lib->open_ref > 0) && *lib_obj)
-                                || (status && *lib_obj == NULL));
 
         dev_dbg(bridge, "%s: target: %p file: %s lib_obj: %p, status 0x%x\n",
                 __func__, target, file, lib_obj, status);
@@ -722,12 +668,6 @@ int dbll_read_sect(struct dbll_library_obj *lib, char *name,
         const struct ldr_section_info *sect = NULL;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_lib);
-        DBC_REQUIRE(name != NULL);
-        DBC_REQUIRE(buf != NULL);
-        DBC_REQUIRE(size != 0);
-
         /* If DOFF file is not open, we open it. */
         if (zl_lib != NULL) {
                 if (zl_lib->fp == NULL) {
@@ -788,14 +728,11 @@ void dbll_unload(struct dbll_library_obj *lib, struct dbll_attrs *attrs)
         struct dbll_library_obj *zl_lib = (struct dbll_library_obj *)lib;
         s32 err = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(zl_lib);
-        DBC_REQUIRE(zl_lib->load_ref > 0);
         dev_dbg(bridge, "%s: lib: %p\n", __func__, lib);
         zl_lib->load_ref--;
         /* Unload only if reference count is 0 */
         if (zl_lib->load_ref != 0)
-                goto func_end;
+                return;
 
         zl_lib->target_obj->attrs = *attrs;
         if (zl_lib->dload_mod_obj) {
@@ -814,8 +751,6 @@ void dbll_unload(struct dbll_library_obj *lib, struct dbll_attrs *attrs)
         /* delete DOFF desc since it holds *lots* of host OS
          * resources */
         dof_close(zl_lib);
-func_end:
-        DBC_ENSURE(zl_lib->load_ref >= 0);
 }
 
 /*
@@ -874,8 +809,6 @@ static u16 name_hash(void *key, u16 max_bucket)
         u16 hash;
         char *name = (char *)key;
 
-        DBC_REQUIRE(name != NULL);
-
         hash = 0;
 
         while (*name) {
@@ -893,9 +826,6 @@ static u16 name_hash(void *key, u16 max_bucket)
  */
 static bool name_match(void *key, void *sp)
 {
-        DBC_REQUIRE(key != NULL);
-        DBC_REQUIRE(sp != NULL);
-
         if ((key != NULL) && (sp != NULL)) {
                 if (strcmp((char *)key, ((struct dbll_symbol *)sp)->name) ==
                     0)
@@ -938,10 +868,7 @@ static int dbll_read_buffer(struct dynamic_loader_stream *this, void *buffer,
         struct dbll_library_obj *lib;
         int bytes_read = 0;
 
-        DBC_REQUIRE(this != NULL);
         lib = pstream->lib;
-        DBC_REQUIRE(lib);
-
         if (lib != NULL) {
                 bytes_read =
                     (*(lib->target_obj->attrs.fread)) (buffer, 1, bufsize,
@@ -960,10 +887,7 @@ static int dbll_set_file_posn(struct dynamic_loader_stream *this,
         struct dbll_library_obj *lib;
         int status = 0;         /* Success */
 
-        DBC_REQUIRE(this != NULL);
         lib = pstream->lib;
-        DBC_REQUIRE(lib);
-
         if (lib != NULL) {
                 status = (*(lib->target_obj->attrs.fseek)) (lib->fp, (long)pos,
                                                             SEEK_SET);
@@ -986,10 +910,7 @@ static struct dynload_symbol *dbll_find_symbol(struct dynamic_loader_sym *this,
         struct dbll_sym_val *dbll_sym = NULL;
         bool status = false;    /* Symbol not found yet */
 
-        DBC_REQUIRE(this != NULL);
         lib = ldr_sym->lib;
-        DBC_REQUIRE(lib);
-
         if (lib != NULL) {
                 if (lib->target_obj->attrs.sym_lookup) {
                         /* Check current lib + base lib + dep lib +
@@ -1034,11 +955,7 @@ static struct dynload_symbol *find_in_symbol_table(struct dynamic_loader_sym
         struct dbll_library_obj *lib;
         struct dbll_symbol *sym;
 
-        DBC_REQUIRE(this != NULL);
         lib = ldr_sym->lib;
-        DBC_REQUIRE(lib);
-        DBC_REQUIRE(lib->sym_tab != NULL);
-
         sym = (struct dbll_symbol *)gh_find(lib->sym_tab, (char *)name);
 
         ret_sym = (struct dynload_symbol *)&sym->value;
@@ -1059,10 +976,7 @@ static struct dynload_symbol *dbll_add_to_symbol_table(struct dynamic_loader_sym
         struct dbll_library_obj *lib;
         struct dynload_symbol *ret;
 
-        DBC_REQUIRE(this != NULL);
-        DBC_REQUIRE(name);
         lib = ldr_sym->lib;
-        DBC_REQUIRE(lib);
 
         /* Check to see if symbol is already defined in symbol table */
         if (!(lib->target_obj->attrs.base_image)) {
@@ -1111,10 +1025,7 @@ static void dbll_purge_symbol_table(struct dynamic_loader_sym *this,
         struct ldr_symbol *ldr_sym = (struct ldr_symbol *)this;
         struct dbll_library_obj *lib;
 
-        DBC_REQUIRE(this != NULL);
         lib = ldr_sym->lib;
-        DBC_REQUIRE(lib);
-
         /* May not need to do anything */
 }
 
@@ -1127,9 +1038,7 @@ static void *allocate(struct dynamic_loader_sym *this, unsigned memsize)
         struct dbll_library_obj *lib;
         void *buf;
 
-        DBC_REQUIRE(this != NULL);
         lib = ldr_sym->lib;
-        DBC_REQUIRE(lib);
 
         buf = kzalloc(memsize, GFP_KERNEL);
 
@@ -1144,9 +1053,7 @@ static void deallocate(struct dynamic_loader_sym *this, void *mem_ptr)
         struct ldr_symbol *ldr_sym = (struct ldr_symbol *)this;
         struct dbll_library_obj *lib;
 
-        DBC_REQUIRE(this != NULL);
         lib = ldr_sym->lib;
-        DBC_REQUIRE(lib);
 
         kfree(mem_ptr);
 }
@@ -1161,9 +1068,7 @@ static void dbll_err_report(struct dynamic_loader_sym *this, const char *errstr,
         struct dbll_library_obj *lib;
         char temp_buf[MAXEXPR];
 
-        DBC_REQUIRE(this != NULL);
         lib = ldr_sym->lib;
-        DBC_REQUIRE(lib);
         vsnprintf((char *)temp_buf, MAXEXPR, (char *)errstr, args);
         dev_dbg(bridge, "%s\n", temp_buf);
 }
@@ -1195,9 +1100,7 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this,
         u32 alloc_size = 0;
         u32 run_addr_flag = 0;
 
-        DBC_REQUIRE(this != NULL);
         lib = dbll_alloc_obj->lib;
-        DBC_REQUIRE(lib);
 
         mem_sect_type =
             (stype == DLOAD_TEXT) ? DBLL_CODE : (stype ==
@@ -1206,7 +1109,6 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this,
 
         /* Attempt to extract the segment ID and requirement information from
            the name of the section */
-        DBC_REQUIRE(info->name);
         token_len = strlen((char *)(info->name)) + 1;
 
         sz_sect_name = kzalloc(token_len, GFP_KERNEL);
@@ -1307,9 +1209,7 @@ static void rmm_dealloc(struct dynamic_loader_allocate *this,
             (stype == DLOAD_TEXT) ? DBLL_CODE : (stype ==
                                                  DLOAD_BSS) ? DBLL_BSS :
             DBLL_DATA;
-        DBC_REQUIRE(this != NULL);
         lib = dbll_alloc_obj->lib;
-        DBC_REQUIRE(lib);
         /* segid was set by alloc function */
         segid = (u32) info->context;
         if (mem_sect_type == DBLL_CODE)
@@ -1347,9 +1247,7 @@ static int read_mem(struct dynamic_loader_initialize *this, void *buf,
         struct dbll_library_obj *lib;
         int bytes_read = 0;
 
-        DBC_REQUIRE(this != NULL);
         lib = init_obj->lib;
-        DBC_REQUIRE(lib);
         /* Need bridge_brd_read function */
         return bytes_read;
 }
@@ -1368,7 +1266,6 @@ static int write_mem(struct dynamic_loader_initialize *this, void *buf,
         u32 mem_sect_type;
         bool ret = true;
 
-        DBC_REQUIRE(this != NULL);
         lib = init_obj->lib;
         if (!lib)
                 return false;
@@ -1415,7 +1312,6 @@ static int fill_mem(struct dynamic_loader_initialize *this, ldr_addr addr,
         struct dbll_library_obj *lib;
         struct dbll_init_obj *init_obj = (struct dbll_init_obj *)this;
 
-        DBC_REQUIRE(this != NULL);
         lib = init_obj->lib;
         pbuf = NULL;
         /* Pass the NULL pointer to write_mem to get the start address of Shared
@@ -1439,9 +1335,7 @@ static int execute(struct dynamic_loader_initialize *this, ldr_addr start)
         struct dbll_library_obj *lib;
         bool ret = true;
 
-        DBC_REQUIRE(this != NULL);
         lib = init_obj->lib;
-        DBC_REQUIRE(lib);
         /* Save entry point */
         if (lib != NULL)
                 lib->entry = (u32) start;
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index 522810bc742..e4257fd7ff0 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -106,8 +106,6 @@ u32 dev_brd_write_fxn(void *arb, u32 dsp_add, void *host_buf,
         u32 ul_written = 0;
         int status;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(host_buf != NULL);  /* Required of BrdWrite(). */
         if (dev_obj) {
                 /* Require of BrdWrite() */
                 DBC_ASSERT(dev_obj->bridge_context != NULL);
@@ -143,9 +141,6 @@ int dev_create_device(struct dev_object **device_obj,
         struct drv_object *hdrv_obj = NULL;
         struct drv_data *drv_datap = dev_get_drvdata(bridge);
         int status = 0;
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(device_obj != NULL);
-        DBC_REQUIRE(driver_file_name != NULL);
 
         status = drv_request_bridge_res_dsp((void *)&host_res);
 
@@ -271,7 +266,6 @@ leave:
                 *device_obj = NULL;
         }
 
-        DBC_ENSURE((!status && *device_obj) || (status && !*device_obj));
         return status;
 }
 
@@ -287,17 +281,12 @@ int dev_create2(struct dev_object *hdev_obj)
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(hdev_obj);
-
         /* There can be only one Node Manager per DEV object */
         DBC_ASSERT(!dev_obj->node_mgr);
         status = node_create_mgr(&dev_obj->node_mgr, hdev_obj);
         if (status)
                 dev_obj->node_mgr = NULL;
 
-        DBC_ENSURE((!status && dev_obj->node_mgr != NULL)
-                   || (status && dev_obj->node_mgr == NULL));
         return status;
 }
 
@@ -311,9 +300,6 @@ int dev_destroy2(struct dev_object *hdev_obj)
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(hdev_obj);
-
         if (dev_obj->node_mgr) {
                 if (node_delete_mgr(dev_obj->node_mgr))
                         status = -EPERM;
@@ -322,7 +308,6 @@ int dev_destroy2(struct dev_object *hdev_obj)
 
         }
 
-        DBC_ENSURE((!status && dev_obj->node_mgr == NULL) || status);
         return status;
 }
 
@@ -337,8 +322,6 @@ int dev_destroy_device(struct dev_object *hdev_obj)
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-
         if (hdev_obj) {
                 if (dev_obj->cod_mgr) {
                         cod_delete(dev_obj->cod_mgr);
@@ -415,9 +398,6 @@ int dev_get_chnl_mgr(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(mgr != NULL);
-
         if (hdev_obj) {
                 *mgr = dev_obj->chnl_mgr;
         } else {
@@ -425,7 +405,6 @@ int dev_get_chnl_mgr(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || (mgr != NULL && *mgr == NULL));
         return status;
 }
 
@@ -441,9 +420,6 @@ int dev_get_cmm_mgr(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(mgr != NULL);
-
         if (hdev_obj) {
                 *mgr = dev_obj->cmm_mgr;
         } else {
@@ -451,7 +427,6 @@ int dev_get_cmm_mgr(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || (mgr != NULL && *mgr == NULL));
         return status;
 }
 
@@ -467,9 +442,6 @@ int dev_get_dmm_mgr(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(mgr != NULL);
-
         if (hdev_obj) {
                 *mgr = dev_obj->dmm_mgr;
         } else {
@@ -477,7 +449,6 @@ int dev_get_dmm_mgr(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || (mgr != NULL && *mgr == NULL));
         return status;
 }
 
@@ -492,9 +463,6 @@ int dev_get_cod_mgr(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(cod_mgr != NULL);
-
         if (hdev_obj) {
                 *cod_mgr = dev_obj->cod_mgr;
         } else {
@@ -502,7 +470,6 @@ int dev_get_cod_mgr(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || (cod_mgr != NULL && *cod_mgr == NULL));
         return status;
 }
 
@@ -514,9 +481,6 @@ int dev_get_deh_mgr(struct dev_object *hdev_obj,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(deh_manager != NULL);
-        DBC_REQUIRE(hdev_obj);
         if (hdev_obj) {
                 *deh_manager = hdev_obj->deh_mgr;
         } else {
@@ -537,9 +501,6 @@ int dev_get_dev_node(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(dev_nde != NULL);
-
         if (hdev_obj) {
                 *dev_nde = dev_obj->dev_node_obj;
         } else {
@@ -547,7 +508,6 @@ int dev_get_dev_node(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || (dev_nde != NULL && *dev_nde == NULL));
         return status;
 }
 
@@ -578,9 +538,6 @@ int dev_get_intf_fxns(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(if_fxns != NULL);
-
         if (hdev_obj) {
                 *if_fxns = &dev_obj->bridge_interface;
         } else {
@@ -588,7 +545,6 @@ int dev_get_intf_fxns(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || ((if_fxns != NULL) && (*if_fxns == NULL)));
         return status;
 }
 
@@ -600,10 +556,6 @@ int dev_get_io_mgr(struct dev_object *hdev_obj,
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(io_man != NULL);
-        DBC_REQUIRE(hdev_obj);
-
         if (hdev_obj) {
                 *io_man = hdev_obj->iomgr;
         } else {
@@ -638,10 +590,6 @@ struct dev_object *dev_get_next(struct dev_object *hdev_obj)
  */
 void dev_get_msg_mgr(struct dev_object *hdev_obj, struct msg_mgr **msg_man)
 {
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(msg_man != NULL);
-        DBC_REQUIRE(hdev_obj);
-
         *msg_man = hdev_obj->msg_mgr;
 }
 
@@ -656,9 +604,6 @@ int dev_get_node_manager(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(node_man != NULL);
-
         if (hdev_obj) {
                 *node_man = dev_obj->node_mgr;
         } else {
@@ -666,7 +611,6 @@ int dev_get_node_manager(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || (node_man != NULL && *node_man == NULL));
         return status;
 }
 
@@ -679,9 +623,6 @@ int dev_get_symbol(struct dev_object *hdev_obj,
         int status = 0;
         struct cod_manager *cod_mgr;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(str_sym != NULL && pul_value != NULL);
-
         if (hdev_obj) {
                 status = dev_get_cod_mgr(hdev_obj, &cod_mgr);
                 if (cod_mgr)
@@ -706,9 +647,6 @@ int dev_get_bridge_context(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(phbridge_context != NULL);
-
         if (hdev_obj) {
                 *phbridge_context = dev_obj->bridge_context;
         } else {
@@ -716,8 +654,6 @@ int dev_get_bridge_context(struct dev_object *hdev_obj,
                 status = -EFAULT;
         }
 
-        DBC_ENSURE(!status || ((phbridge_context != NULL) &&
-                                             (*phbridge_context == NULL)));
         return status;
 }
 
@@ -729,16 +665,12 @@ int dev_get_bridge_context(struct dev_object *hdev_obj,
  */
 void dev_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
-
         refs--;
 
         if (refs == 0) {
                 cmm_exit();
                 dmm_exit();
         }
-
-        DBC_ENSURE(refs >= 0);
 }
 
 /*
@@ -750,8 +682,6 @@ bool dev_init(void)
 {
         bool cmm_ret, dmm_ret, ret = true;
 
-        DBC_REQUIRE(refs >= 0);
-
         if (refs == 0) {
                 cmm_ret = cmm_init();
                 dmm_ret = dmm_init();
@@ -771,8 +701,6 @@ bool dev_init(void)
         if (ret)
                 refs++;
 
-        DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
-
         return ret;
 }
 
@@ -841,14 +769,11 @@ int dev_set_chnl_mgr(struct dev_object *hdev_obj,
         int status = 0;
         struct dev_object *dev_obj = hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-
         if (hdev_obj)
                 dev_obj->chnl_mgr = hmgr;
         else
                 status = -EFAULT;
 
-        DBC_ENSURE(status || (dev_obj->chnl_mgr == hmgr));
         return status;
 }
 
@@ -859,9 +784,6 @@ int dev_set_chnl_mgr(struct dev_object *hdev_obj,
  */
 void dev_set_msg_mgr(struct dev_object *hdev_obj, struct msg_mgr *hmgr)
 {
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(hdev_obj);
-
         hdev_obj->msg_mgr = hmgr;
 }
 
@@ -879,8 +801,6 @@ int dev_start_device(struct cfg_devnode *dev_node_obj)
         struct mgr_object *hmgr_obj = NULL;
         struct drv_data *drv_datap = dev_get_drvdata(bridge);
 
-        DBC_REQUIRE(refs > 0);
-
         /* Given all resources, create a device object. */
         status = dev_create_device(&hdev_obj, bridge_file_name,
                                    dev_node_obj);
@@ -944,9 +864,6 @@ static int init_cod_mgr(struct dev_object *dev_obj)
         int status = 0;
         char *sz_dummy_file = "dummy";
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(!dev_obj || (dev_obj->cod_mgr == NULL));
-
         status = cod_create(&dev_obj->cod_mgr, sz_dummy_file);
 
         return status;
@@ -976,10 +893,6 @@ int dev_insert_proc_object(struct dev_object *hdev_obj,
 {
         struct dev_object *dev_obj = (struct dev_object *)hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(dev_obj);
-        DBC_REQUIRE(proc_obj != 0);
-        DBC_REQUIRE(already_attached != NULL);
         if (!list_empty(&dev_obj->proc_list))
                 *already_attached = true;
 
@@ -1017,10 +930,6 @@ int dev_remove_proc_object(struct dev_object *hdev_obj, u32 proc_obj)
         struct list_head *cur_elem;
         struct dev_object *dev_obj = (struct dev_object *)hdev_obj;
 
-        DBC_REQUIRE(dev_obj);
-        DBC_REQUIRE(proc_obj != 0);
-        DBC_REQUIRE(!list_empty(&dev_obj->proc_list));
-
         /* Search list for dev_obj: */
         list_for_each(cur_elem, &dev_obj->proc_list) {
                 if ((u32) cur_elem == proc_obj) {
@@ -1069,10 +978,6 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
     (intf_fxns->pfn = ((drv_fxns->pfn != NULL) ? drv_fxns->pfn : \
     (cast)fxn_not_implemented))
 
-        DBC_REQUIRE(intf_fxns != NULL);
-        DBC_REQUIRE(drv_fxns != NULL);
-        DBC_REQUIRE(MAKEVERSION(drv_fxns->brd_api_major_version,
-                        drv_fxns->brd_api_minor_version) <= BRD_API_VERSION);
         bridge_version = MAKEVERSION(drv_fxns->brd_api_major_version,
                                      drv_fxns->brd_api_minor_version);
         intf_fxns->brd_api_major_version = drv_fxns->brd_api_major_version;
@@ -1119,33 +1024,5 @@ static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
                 STORE_FXN(fxn_msg_setqueueid, msg_set_queue_id);
         }
         /* Add code for any additional functions in newerBridge versions here */
-        /* Ensure postcondition: */
-        DBC_ENSURE(intf_fxns->dev_create != NULL);
-        DBC_ENSURE(intf_fxns->dev_destroy != NULL);
-        DBC_ENSURE(intf_fxns->dev_cntrl != NULL);
-        DBC_ENSURE(intf_fxns->brd_monitor != NULL);
-        DBC_ENSURE(intf_fxns->brd_start != NULL);
-        DBC_ENSURE(intf_fxns->brd_stop != NULL);
-        DBC_ENSURE(intf_fxns->brd_status != NULL);
-        DBC_ENSURE(intf_fxns->brd_read != NULL);
-        DBC_ENSURE(intf_fxns->brd_write != NULL);
-        DBC_ENSURE(intf_fxns->chnl_create != NULL);
-        DBC_ENSURE(intf_fxns->chnl_destroy != NULL);
-        DBC_ENSURE(intf_fxns->chnl_open != NULL);
-        DBC_ENSURE(intf_fxns->chnl_close != NULL);
-        DBC_ENSURE(intf_fxns->chnl_add_io_req != NULL);
-        DBC_ENSURE(intf_fxns->chnl_get_ioc != NULL);
-        DBC_ENSURE(intf_fxns->chnl_cancel_io != NULL);
-        DBC_ENSURE(intf_fxns->chnl_flush_io != NULL);
-        DBC_ENSURE(intf_fxns->chnl_get_info != NULL);
-        DBC_ENSURE(intf_fxns->chnl_get_mgr_info != NULL);
-        DBC_ENSURE(intf_fxns->chnl_idle != NULL);
-        DBC_ENSURE(intf_fxns->chnl_register_notify != NULL);
-        DBC_ENSURE(intf_fxns->io_create != NULL);
-        DBC_ENSURE(intf_fxns->io_destroy != NULL);
-        DBC_ENSURE(intf_fxns->io_on_loaded != NULL);
-        DBC_ENSURE(intf_fxns->io_get_proc_load != NULL);
-        DBC_ENSURE(intf_fxns->msg_set_queue_id != NULL);
-
 #undef  STORE_FXN
 }
diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c
index 8685233d762..cece7801d6c 100644
--- a/drivers/staging/tidspbridge/pmgr/dmm.c
+++ b/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -123,8 +123,6 @@ int dmm_create(struct dmm_object **dmm_manager,
 {
         struct dmm_object *dmm_obj = NULL;
         int status = 0;
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(dmm_manager != NULL);
 
         *dmm_manager = NULL;
         /* create, zero, and tag a cmm mgr object */
@@ -149,7 +147,6 @@ int dmm_destroy(struct dmm_object *dmm_mgr)
         struct dmm_object *dmm_obj = (struct dmm_object *)dmm_mgr;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
         if (dmm_mgr) {
                 status = dmm_delete_tables(dmm_obj);
                 if (!status)
@@ -169,7 +166,6 @@ int dmm_delete_tables(struct dmm_object *dmm_mgr)
 {
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
         /* Delete all DMM tables */
         if (dmm_mgr)
                 vfree(virtual_mapping_table);
@@ -186,7 +182,6 @@ int dmm_delete_tables(struct dmm_object *dmm_mgr)
  */
 void dmm_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
 
         refs--;
 }
@@ -202,8 +197,6 @@ int dmm_get_handle(void *hprocessor, struct dmm_object **dmm_manager)
         int status = 0;
         struct dev_object *hdev_obj;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(dmm_manager != NULL);
         if (hprocessor != NULL)
                 status = proc_get_dev_object(hprocessor, &hdev_obj);
         else
@@ -224,13 +217,9 @@ bool dmm_init(void)
 {
         bool ret = true;
 
-        DBC_REQUIRE(refs >= 0);
-
         if (ret)
                 refs++;
 
-        DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
-
         virtual_mapping_table = NULL;
         table_size = 0;
 
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index 767ffe270ed..27c14a577dc 100644
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -266,7 +266,6 @@ err:
  */
 void api_exit(void)
 {
-        DBC_REQUIRE(api_c_refs > 0);
         api_c_refs--;
 
         if (api_c_refs == 0) {
@@ -284,7 +283,6 @@ void api_exit(void)
                 rmm_exit();
                 drv_exit();
         }
-        DBC_ENSURE(api_c_refs >= 0);
 }
 
 /*
@@ -382,8 +380,6 @@ int api_init_complete2(void)
         struct drv_data *drv_datap;
         u8 dev_type;
 
-        DBC_REQUIRE(api_c_refs > 0);
-
         /*  Walk the list of DevObjects, get each devnode, and attempting to
          *  autostart the board. Note that this requires COF loading, which
          *  requires KFILE. */
diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c
index 65245f310f8..bbfe94cb36b 100644
--- a/drivers/staging/tidspbridge/pmgr/io.c
+++ b/drivers/staging/tidspbridge/pmgr/io.c
@@ -50,10 +50,6 @@ int io_create(struct io_mgr **io_man, struct dev_object *hdev_obj,
         struct io_mgr_ *pio_mgr = NULL;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(io_man != NULL);
-        DBC_REQUIRE(mgr_attrts != NULL);
-
         *io_man = NULL;
 
         /* A memory base of 0 implies no memory base: */
@@ -94,8 +90,6 @@ int io_destroy(struct io_mgr *hio_mgr)
         struct io_mgr_ *pio_mgr = (struct io_mgr_ *)hio_mgr;
         int status;
 
-        DBC_REQUIRE(refs > 0);
-
         intf_fxns = pio_mgr->intf_fxns;
 
         /* Let Bridge channel module destroy the io_mgr: */
@@ -111,11 +105,7 @@ int io_destroy(struct io_mgr *hio_mgr)
  */
 void io_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
-
         refs--;
-
-        DBC_ENSURE(refs >= 0);
 }
 
 /*
@@ -127,12 +117,8 @@ bool io_init(void)
 {
         bool ret = true;
 
-        DBC_REQUIRE(refs >= 0);
-
         if (ret)
                 refs++;
 
-        DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
-
         return ret;
 }
diff --git a/drivers/staging/tidspbridge/pmgr/msg.c b/drivers/staging/tidspbridge/pmgr/msg.c
index a6916039eed..150026dfc74 100644
--- a/drivers/staging/tidspbridge/pmgr/msg.c
+++ b/drivers/staging/tidspbridge/pmgr/msg.c
@@ -53,11 +53,6 @@ int msg_create(struct msg_mgr **msg_man,
         struct msg_mgr *hmsg_mgr;
         int status = 0;
 
-        DBC_REQUIRE(refs > 0);
-        DBC_REQUIRE(msg_man != NULL);
-        DBC_REQUIRE(msg_callback != NULL);
-        DBC_REQUIRE(hdev_obj != NULL);
-
         *msg_man = NULL;
 
         dev_get_intf_fxns(hdev_obj, &intf_fxns);
@@ -90,8 +85,6 @@ void msg_delete(struct msg_mgr *hmsg_mgr)
         struct msg_mgr_ *msg_mgr_obj = (struct msg_mgr_ *)hmsg_mgr;
         struct bridge_drv_interface *intf_fxns;
 
-        DBC_REQUIRE(refs > 0);
-
         if (msg_mgr_obj) {
                 intf_fxns = msg_mgr_obj->intf_fxns;
 
@@ -108,10 +101,7 @@ void msg_delete(struct msg_mgr *hmsg_mgr)
  */
 void msg_exit(void)
 {
-        DBC_REQUIRE(refs > 0);
         refs--;
-
-        DBC_ENSURE(refs >= 0);
 }
 
 /*
@@ -119,11 +109,7 @@ void msg_exit(void)
  */
 bool msg_mod_init(void)
 {
-        DBC_REQUIRE(refs >= 0);
-
         refs++;
 
-        DBC_ENSURE(refs >= 0);
-
         return true;
 }