1 files changed, 0 insertions, 59 deletions

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;