Skip to content

L
linux
Commit 276cc746 authored by Víctor Manuel Jáquez Leal's avatar Víctor Manuel Jáquez Leal Committed by Greg Kroah-Hartman
Browse files
Options

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: default avatarVíctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8900f00b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 946 deletions
drivers/staging/tidspbridge/core/chnl_sm.c
View file @ 276cc746
......@@ -358,13 +358,6 @@ int bridge_chnl_create(struct chnl_mgr **channel_mgr,
struct chnl_mgr *chnl_mgr_obj = NULL;
u8 max_channels;
/* Check DBC requirements: */
DBC_REQUIRE(channel_mgr != NULL);
DBC_REQUIRE(mgr_attrts != NULL);
DBC_REQUIRE(mgr_attrts->max_channels > 0);
DBC_REQUIRE(mgr_attrts->max_channels <= CHNL_MAXCHANNELS);
DBC_REQUIRE(mgr_attrts->word_size != 0);
/* Allocate channel manager object */
chnl_mgr_obj = kzalloc(sizeof(struct chnl_mgr), GFP_KERNEL);
if (chnl_mgr_obj) {
......@@ -491,7 +484,6 @@ int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 timeout)
pchnl->state &= ~CHNL_STATECANCEL;
}
}
DBC_ENSURE(status || list_empty(&pchnl->io_requests));
return status;
}
......@@ -705,8 +697,6 @@ int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 timeout,
struct chnl_mgr *chnl_mgr_obj;
int status = 0;
DBC_REQUIRE(chnl_obj);
chnl_mode = chnl_obj->chnl_mode;
chnl_mgr_obj = chnl_obj->chnl_mgr_obj;
......@@ -736,10 +726,7 @@ int bridge_chnl_open(struct chnl_object **chnl,
struct chnl_mgr *chnl_mgr_obj = hchnl_mgr;
struct chnl_object *pchnl = NULL;
struct sync_object *sync_event = NULL;
/* Ensure DBC requirements: */
DBC_REQUIRE(chnl != NULL);
DBC_REQUIRE(pattrs != NULL);
DBC_REQUIRE(hchnl_mgr != NULL);
*chnl = NULL;
/* Validate Args: */
......@@ -906,8 +893,6 @@ static void free_chirp_list(struct list_head *chirp_list)
{
struct chnl_irp *chirp, *tmp;
DBC_REQUIRE(chirp_list != NULL);
list_for_each_entry_safe(chirp, tmp, chirp_list, link) {
list_del(&chirp->link);
kfree(chirp);
......@@ -924,8 +909,6 @@ static int search_free_channel(struct chnl_mgr *chnl_mgr_obj,
int status = -ENOSR;
u32 i;
DBC_REQUIRE(chnl_mgr_obj);
for (i = 0; i < chnl_mgr_obj->max_channels; i++) {
if (chnl_mgr_obj->channels[i] == NULL) {
status = 0;
......
drivers/staging/tidspbridge/core/tiomap3430.c
View file @ 276cc746
......@@ -256,9 +256,6 @@ static void bad_page_dump(u32 pa, struct page *pg)
void bridge_drv_entry(struct bridge_drv_interface **drv_intf,
const char *driver_file_name)
{
DBC_REQUIRE(driver_file_name != NULL);
if (strcmp(driver_file_name, "UMA") == 0)
*drv_intf = &drv_interface_fxns;
else
......
drivers/staging/tidspbridge/gen/uuidutil.c
View file @ 276cc746
......@@ -41,8 +41,6 @@ void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, char *sz_uuid,
{
s32 i; /* return result from snprintf. */
DBC_REQUIRE(uuid_obj && sz_uuid);
i = snprintf(sz_uuid, size,
"%.8X_%.4X_%.4X_%.2X%.2X_%.2X%.2X%.2X%.2X%.2X%.2X",
uuid_obj->data1, uuid_obj->data2, uuid_obj->data3,
......@@ -50,8 +48,6 @@ void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, char *sz_uuid,
uuid_obj->data6[0], uuid_obj->data6[1],
uuid_obj->data6[2], uuid_obj->data6[3],
uuid_obj->data6[4], uuid_obj->data6[5]);
DBC_ENSURE(i != -1);
}
static s32 uuid_hex_to_bin(char *buf, s32 len)
......
drivers/staging/tidspbridge/include/dspbridge/dbc.h
View file @ 276cc746
......@@ -32,15 +32,8 @@
if (!(exp)) \
pr_err("%s, line %d: Assertion (" #exp ") failed.\n", \
__FILE__, __LINE__)
#define DBC_REQUIRE DBC_ASSERT /* Function Precondition. */
#define DBC_ENSURE DBC_ASSERT /* Function Postcondition. */
#else
#define DBC_ASSERT(exp) {}
#define DBC_REQUIRE(exp) {}
#define DBC_ENSURE(exp) {}
#endif /* DEBUG */
#endif /* DBC_ */
drivers/staging/tidspbridge/pmgr/chnl.c
View file @ 276cc746
......@@ -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;
}
drivers/staging/tidspbridge/pmgr/cmm.c
View file @ 276cc746
......@@ -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;
......
drivers/staging/tidspbridge/pmgr/cod.c
View file @ 276cc746
......@@ -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,
......
drivers/staging/tidspbridge/pmgr/dbll.c
View file @ 276cc746
This diff is collapsed.
drivers/staging/tidspbridge/pmgr/dev.c
View file @ 276cc746
This diff is collapsed.
drivers/staging/tidspbridge/pmgr/dmm.c
View file @ 276cc746
......@@ -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;
......
drivers/staging/tidspbridge/pmgr/dspapi.c
View file @ 276cc746
......@@ -266,7 +266,6 @@ inline int api_call_dev_ioctl(u32 cmd, union trapped_args *args,
*/
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. */
......
drivers/staging/tidspbridge/pmgr/io.c
View file @ 276cc746
......@@ -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;
}
drivers/staging/tidspbridge/pmgr/msg.c
View file @ 276cc746
......@@ -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;
}
drivers/staging/tidspbridge/rmgr/dbdcd.c
View file @ 276cc746
......@@ -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) {
......
drivers/staging/tidspbridge/rmgr/disp.c
View file @ 276cc746
......@@ -96,11 +96,6 @@ int disp_create(struct disp_object **dispatch_obj,
int status = 0;
u8 dev_type;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(dispatch_obj != NULL);
DBC_REQUIRE(disp_attrs != NULL);
DBC_REQUIRE(hdev_obj != NULL);
*dispatch_obj = NULL;
/* Allocate Node Dispatcher object */
......@@ -168,8 +163,6 @@ int disp_create(struct disp_object **dispatch_obj,
else
delete_disp(disp_obj);
DBC_ENSURE((status && *dispatch_obj == NULL) ||
(!status && *dispatch_obj));
return status;
}
......@@ -179,9 +172,6 @@ int disp_create(struct disp_object **dispatch_obj,
*/
void disp_delete(struct disp_object *disp_obj)
{
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(disp_obj);
delete_disp(disp_obj);
}
......@@ -191,11 +181,7 @@ void disp_delete(struct disp_object *disp_obj)
*/
void disp_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
DBC_ENSURE(refs >= 0);
}
/*
......@@ -206,12 +192,9 @@ bool disp_init(void)
{
bool ret = true;
DBC_REQUIRE(refs >= 0);
if (ret)
refs++;
DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
return ret;
}
......@@ -227,10 +210,6 @@ int disp_node_change_priority(struct disp_object *disp_obj,
struct rms_command *rms_cmd;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(disp_obj);
DBC_REQUIRE(hnode != NULL);
/* Send message to RMS to change priority */
rms_cmd = (struct rms_command *)(disp_obj->buf);
rms_cmd->fxn = (rms_word) (rms_fxn);
......@@ -276,12 +255,6 @@ int disp_node_create(struct disp_object *disp_obj,
struct dsp_nodeinfo node_info;
u8 dev_type;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(disp_obj);
DBC_REQUIRE(hnode != NULL);
DBC_REQUIRE(node_get_type(hnode) != NODE_DEVICE);
DBC_REQUIRE(node_env != NULL);
status = dev_get_dev_type(disp_obj->dev_obj, &dev_type);
if (status)
......@@ -292,7 +265,6 @@ int disp_node_create(struct disp_object *disp_obj,
__func__, dev_type);
goto func_end;
}
DBC_REQUIRE(pargs != NULL);
node_type = node_get_type(hnode);
node_msg_args = pargs->asa.node_msg_args;
max = disp_obj->bufsize_rms; /*Max # of RMS words that can be sent */
......@@ -480,10 +452,6 @@ int disp_node_delete(struct disp_object *disp_obj,
int status = 0;
u8 dev_type;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(disp_obj);
DBC_REQUIRE(hnode != NULL);
status = dev_get_dev_type(disp_obj->dev_obj, &dev_type);
if (!status) {
......@@ -521,9 +489,6 @@ int disp_node_run(struct disp_object *disp_obj,
struct rms_command *rms_cmd;
int status = 0;
u8 dev_type;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(disp_obj);
DBC_REQUIRE(hnode != NULL);
status = dev_get_dev_type(disp_obj->dev_obj, &dev_type);
......@@ -620,7 +585,6 @@ static int fill_stream_def(rms_word *pdw_buf, u32 *ptotal, u32 offset,
* 1 from total.
*/
total += sizeof(struct rms_strm_def) / sizeof(rms_word) - 1;
DBC_REQUIRE(strm_def.sz_device);
dw_length = strlen(strm_def.sz_device) + 1;
/* Number of RMS_WORDS needed to hold device name */
......@@ -659,8 +623,6 @@ static int send_message(struct disp_object *disp_obj, u32 timeout,
struct chnl_ioc chnl_ioc_obj;
int status = 0;
DBC_REQUIRE(pdw_arg != NULL);
*pdw_arg = (u32) NULL;
intf_fxns = disp_obj->intf_fxns;
chnl_obj = disp_obj->chnl_to_dsp;
......
drivers/staging/tidspbridge/rmgr/drv.c
View file @ 276cc746
......@@ -308,9 +308,6 @@ int drv_create(struct drv_object **drv_obj)
struct drv_object *pdrv_object = NULL;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
DBC_REQUIRE(drv_obj != NULL);
DBC_REQUIRE(refs > 0);
pdrv_object = kzalloc(sizeof(struct drv_object), GFP_KERNEL);
if (pdrv_object) {
/* Create and Initialize List of device objects */
......@@ -336,7 +333,6 @@ int drv_create(struct drv_object **drv_obj)
kfree(pdrv_object);
}
DBC_ENSURE(status || pdrv_object);
return status;
}
......@@ -347,11 +343,7 @@ int drv_create(struct drv_object **drv_obj)
*/
void drv_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
DBC_ENSURE(refs >= 0);
}
/*
......@@ -365,9 +357,6 @@ int drv_destroy(struct drv_object *driver_obj)
struct drv_object *pdrv_object = (struct drv_object *)driver_obj;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pdrv_object);
kfree(pdrv_object);
/* Update the DRV Object in the driver data */
if (drv_datap) {
......@@ -395,10 +384,6 @@ int drv_get_dev_object(u32 index, struct drv_object *hdrv_obj,
#endif
struct dev_object *dev_obj;
u32 i;
DBC_REQUIRE(pdrv_obj);
DBC_REQUIRE(device_obj != NULL);
DBC_REQUIRE(index >= 0);
DBC_REQUIRE(refs > 0);
DBC_ASSERT(!(list_empty(&pdrv_obj->dev_list)));
dev_obj = (struct dev_object *)drv_get_first_dev_object();
......@@ -532,13 +517,9 @@ int drv_init(void)
{
s32 ret = 1; /* function return value */
DBC_REQUIRE(refs >= 0);
if (ret)
refs++;
DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
return ret;
}
......@@ -552,10 +533,6 @@ int drv_insert_dev_object(struct drv_object *driver_obj,
{
struct drv_object *pdrv_object = (struct drv_object *)driver_obj;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hdev_obj != NULL);
DBC_REQUIRE(pdrv_object);
list_add_tail((struct list_head *)hdev_obj, &pdrv_object->dev_list);
return 0;
......@@ -574,12 +551,6 @@ int drv_remove_dev_object(struct drv_object *driver_obj,
struct drv_object *pdrv_object = (struct drv_object *)driver_obj;
struct list_head *cur_elem;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pdrv_object);
DBC_REQUIRE(hdev_obj != NULL);
DBC_REQUIRE(!list_empty(&pdrv_object->dev_list));
/* Search list for p_proc_object: */
list_for_each(cur_elem, &pdrv_object->dev_list) {
/* If found, remove it. */
......@@ -605,9 +576,6 @@ int drv_request_resources(u32 dw_context, u32 *dev_node_strg)
struct drv_ext *pszdev_node;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
DBC_REQUIRE(dw_context != 0);
DBC_REQUIRE(dev_node_strg != NULL);
/*
* Allocate memory to hold the string. This will live until
* it is freed in the Release resources. Update the driver object
......@@ -639,10 +607,6 @@ int drv_request_resources(u32 dw_context, u32 *dev_node_strg)
*dev_node_strg = 0;
}
DBC_ENSURE((!status && dev_node_strg != NULL &&
!list_empty(&pdrv_object->dev_node_string)) ||
(status && *dev_node_strg == 0));
return status;
}
......@@ -900,8 +864,6 @@ void *mem_alloc_phys_mem(u32 byte_size, u32 align_mask,
void mem_free_phys_mem(void *virtual_address, u32 physical_address,
u32 byte_size)
{
DBC_REQUIRE(virtual_address != NULL);
if (!ext_phys_mem_pool_enabled)
dma_free_coherent(NULL, byte_size, virtual_address,
physical_address);
......
drivers/staging/tidspbridge/rmgr/drv_interface.c
View file @ 276cc746
......@@ -212,7 +212,6 @@ static long bridge_ioctl(struct file *filp, unsigned int code,
u32 retval = 0;
union trapped_args buf_in;
DBC_REQUIRE(filp != NULL);
#ifdef CONFIG_TIDSPBRIDGE_RECOVERY
if (recover) {
status = -EIO;
......
drivers/staging/tidspbridge/rmgr/dspdrv.c
View file @ 276cc746
......@@ -102,8 +102,6 @@ u32 dsp_init(u32 *init_status)
} else {
dev_dbg(bridge, "%s: Failed\n", __func__);
} /* End api_init_complete2 */
DBC_ENSURE((!status && drv_obj != NULL) ||
(status && drv_obj == NULL));
*init_status = status;
/* Return the Driver Object */
return (u32) drv_obj;
......
drivers/staging/tidspbridge/rmgr/mgr.c
View file @ 276cc746
......@@ -62,9 +62,6 @@ int mgr_create(struct mgr_object **mgr_obj,
struct mgr_object *pmgr_obj = NULL;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
DBC_REQUIRE(mgr_obj != NULL);
DBC_REQUIRE(refs > 0);
pmgr_obj = kzalloc(sizeof(struct mgr_object), GFP_KERNEL);
if (pmgr_obj) {
status = dcd_create_manager(ZLDLLNAME, &pmgr_obj->dcd_mgr);
......@@ -92,7 +89,6 @@ int mgr_create(struct mgr_object **mgr_obj,
status = -ENOMEM;
}
DBC_ENSURE(status || pmgr_obj);
return status;
}
......@@ -106,9 +102,6 @@ int mgr_destroy(struct mgr_object *hmgr_obj)
struct mgr_object *pmgr_obj = (struct mgr_object *)hmgr_obj;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hmgr_obj);
/* Free resources */
if (hmgr_obj->dcd_mgr)
dcd_destroy_manager(hmgr_obj->dcd_mgr);
......@@ -140,11 +133,6 @@ int mgr_enum_node_info(u32 node_id, struct dsp_ndbprops *pndb_props,
struct mgr_object *pmgr_obj = NULL;
struct drv_data *drv_datap = dev_get_drvdata(bridge);
DBC_REQUIRE(pndb_props != NULL);
DBC_REQUIRE(pu_num_nodes != NULL);
DBC_REQUIRE(undb_props_size >= sizeof(struct dsp_ndbprops));
DBC_REQUIRE(refs > 0);
*pu_num_nodes = 0;
/* Get the Manager Object from the driver data */
if (!drv_datap || !drv_datap->mgr_object) {
......@@ -205,11 +193,6 @@ int mgr_enum_processor_info(u32 processor_id,
struct drv_data *drv_datap = dev_get_drvdata(bridge);
bool proc_detect = false;
DBC_REQUIRE(processor_info != NULL);
DBC_REQUIRE(pu_num_procs != NULL);
DBC_REQUIRE(processor_info_size >= sizeof(struct dsp_processorinfo));
DBC_REQUIRE(refs > 0);
*pu_num_procs = 0;
/* Retrieve the Object handle from the driver data */
......@@ -310,12 +293,9 @@ int mgr_enum_processor_info(u32 processor_id,
*/
void mgr_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
if (refs == 0)
dcd_exit();
DBC_ENSURE(refs >= 0);
}
/*
......@@ -328,16 +308,11 @@ int mgr_get_dcd_handle(struct mgr_object *mgr_handle,
int status = -EPERM;
struct mgr_object *pmgr_obj = (struct mgr_object *)mgr_handle;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(dcd_handle != NULL);
*dcd_handle = (u32) NULL;
if (pmgr_obj) {
*dcd_handle = (u32) pmgr_obj->dcd_mgr;
status = 0;
}
DBC_ENSURE((!status && *dcd_handle != (u32) NULL) ||
(status && *dcd_handle == (u32) NULL));
return status;
}
......@@ -351,8 +326,6 @@ bool mgr_init(void)
bool ret = true;
bool init_dcd = false;
DBC_REQUIRE(refs >= 0);
if (refs == 0) {
init_dcd = dcd_init(); /* DCD Module */
......@@ -363,8 +336,6 @@ bool mgr_init(void)
if (ret)
refs++;
DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
return ret;
}
......@@ -380,8 +351,6 @@ int mgr_wait_for_bridge_events(struct dsp_notification **anotifications,
struct sync_object *sync_events[MAX_EVENTS];
u32 i;
DBC_REQUIRE(count < MAX_EVENTS);
for (i = 0; i < count; i++)
sync_events[i] = anotifications[i]->handle;
......
drivers/staging/tidspbridge/rmgr/nldr.c
View file @ 276cc746
......@@ -313,11 +313,6 @@ int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
struct nldr_nodeobject *nldr_node_obj = NULL;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(node_props != NULL);
DBC_REQUIRE(nldr_nodeobj != NULL);
DBC_REQUIRE(nldr_obj);
/* Initialize handle in case of failure */
*nldr_nodeobj = NULL;
/* Allocate node object */
......@@ -398,8 +393,6 @@ int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
if (status && nldr_node_obj)
kfree(nldr_node_obj);
DBC_ENSURE((!status && *nldr_nodeobj)
|| (status && *nldr_nodeobj == NULL));
return status;
}
......@@ -425,12 +418,6 @@ int nldr_create(struct nldr_object **nldr,
struct rmm_segment *rmm_segs = NULL;
u16 i;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(nldr != NULL);
DBC_REQUIRE(hdev_obj != NULL);
DBC_REQUIRE(pattrs != NULL);
DBC_REQUIRE(pattrs->ovly != NULL);
DBC_REQUIRE(pattrs->write != NULL);
/* Allocate dynamic loader object */
nldr_obj = kzalloc(sizeof(struct nldr_object), GFP_KERNEL);
......@@ -583,7 +570,6 @@ int nldr_create(struct nldr_object **nldr,
*nldr = NULL;
}
/* FIXME:Temp. Fix. Must be removed */
DBC_ENSURE((!status && *nldr) || (status && *nldr == NULL));
return status;
}
......@@ -595,8 +581,6 @@ void nldr_delete(struct nldr_object *nldr_obj)
struct ovly_sect *ovly_section;
struct ovly_sect *next;
u16 i;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(nldr_obj);
nldr_obj->ldr_fxns.exit_fxn();
if (nldr_obj->rmm)
......@@ -649,14 +633,10 @@ void nldr_delete(struct nldr_object *nldr_obj)
*/
void nldr_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
if (refs == 0)
rmm_exit();
DBC_ENSURE(refs >= 0);
}
/*
......@@ -671,10 +651,6 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj,
bool status1 = false;
s32 i = 0;
struct lib_node root = { NULL, 0, NULL };
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(nldr_node_obj);
DBC_REQUIRE(addr != NULL);
DBC_REQUIRE(str_fxn != NULL);
nldr_obj = nldr_node_obj->nldr_obj;
/* Called from node_create(), node_delete(), or node_run(). */
......@@ -760,7 +736,6 @@ int nldr_get_rmm_manager(struct nldr_object *nldr,
{
int status = 0;
struct nldr_object *nldr_obj = nldr;
DBC_REQUIRE(rmm_mgr != NULL);
if (nldr) {
*rmm_mgr = nldr_obj->rmm;
......@@ -769,8 +744,6 @@ int nldr_get_rmm_manager(struct nldr_object *nldr,
status = -EFAULT;
}
DBC_ENSURE(!status || (rmm_mgr != NULL && *rmm_mgr == NULL));
return status;
}
......@@ -780,14 +753,11 @@ int nldr_get_rmm_manager(struct nldr_object *nldr,
*/
bool nldr_init(void)
{
DBC_REQUIRE(refs >= 0);
if (refs == 0)
rmm_init();
refs++;
DBC_ENSURE(refs > 0);
return true;
}
......@@ -801,9 +771,6 @@ int nldr_load(struct nldr_nodeobject *nldr_node_obj,
struct dsp_uuid lib_uuid;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(nldr_node_obj);
nldr_obj = nldr_node_obj->nldr_obj;
if (nldr_node_obj->dynamic) {
......@@ -863,9 +830,6 @@ int nldr_unload(struct nldr_nodeobject *nldr_node_obj,
struct lib_node *root_lib = NULL;
s32 i = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(nldr_node_obj);
if (nldr_node_obj != NULL) {
if (nldr_node_obj->dynamic) {
if (*nldr_node_obj->phase_split) {
......@@ -929,7 +893,6 @@ static int add_ovly_info(void *handle, struct dbll_sect_info *sect_info,
/* Find the node it belongs to */
for (i = 0; i < nldr_obj->ovly_nodes; i++) {
node_name = nldr_obj->ovly_table[i].node_name;
DBC_REQUIRE(node_name);
if (strncmp(node_name, sect_name + 1, strlen(node_name)) == 0) {
/* Found the node */
break;
......@@ -1018,8 +981,6 @@ static int add_ovly_node(struct dsp_uuid *uuid_obj,
/* Add node to table */
nldr_obj->ovly_table[nldr_obj->ovly_nid].uuid =
*uuid_obj;
DBC_REQUIRE(obj_def.obj_data.node_obj.ndb_props.
ac_name);
len =
strlen(obj_def.obj_data.node_obj.ndb_props.ac_name);
node_name = obj_def.obj_data.node_obj.ndb_props.ac_name;
......@@ -1623,9 +1584,6 @@ static int remote_alloc(void **ref, u16 mem_sect, u32 size,
struct rmm_addr *rmm_addr_obj = (struct rmm_addr *)dsp_address;
bool mem_load_req = false;
int status = -ENOMEM; /* Set to fail */
DBC_REQUIRE(hnode);
DBC_REQUIRE(mem_sect == DBLL_CODE || mem_sect == DBLL_DATA ||
mem_sect == DBLL_BSS);
nldr_obj = hnode->nldr_obj;
rmm = nldr_obj->rmm;
/* Convert size to DSP words */
......@@ -1736,8 +1694,6 @@ static int remote_free(void **ref, u16 space, u32 dsp_address,
u32 word_size;
int status = -ENOMEM; /* Set to fail */
DBC_REQUIRE(nldr_obj);
rmm = nldr_obj->rmm;
/* Convert size to DSP words */
......@@ -1897,9 +1853,6 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr,
bool status1 = false;
s32 i = 0;
struct lib_node root = { NULL, 0, NULL };
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(offset_output != NULL);
DBC_REQUIRE(sym_name != NULL);
pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", __func__, (u32) nldr_node,
sym_addr, offset_range, (u32) offset_output, sym_name);
......
drivers/staging/tidspbridge/rmgr/node.c
View file @ 276cc746
......@@ -326,11 +326,6 @@ int node_allocate(struct proc_object *hprocessor,
void *node_res;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hprocessor != NULL);
DBC_REQUIRE(noderes != NULL);
DBC_REQUIRE(node_uuid != NULL);
*noderes = NULL;
status = proc_get_processor_id(hprocessor, &proc_id);
......@@ -673,7 +668,6 @@ int node_allocate(struct proc_object *hprocessor,
drv_proc_node_update_heap_status(node_res, true);
drv_proc_node_update_status(node_res, true);
}
DBC_ENSURE((status && *noderes == NULL) || (!status && *noderes));
func_end:
dev_dbg(bridge, "%s: hprocessor: %p pNodeId: %p pargs: %p attr_in: %p "
"node_res: %p status: 0x%x\n", __func__, hprocessor,
......@@ -696,11 +690,6 @@ DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize,
bool set_info;
u32 proc_id;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pbuffer != NULL);
DBC_REQUIRE(usize > 0);
if (!pnode)
status = -EFAULT;
else if (node_get_type(pnode) == NODE_DEVICE)
......@@ -782,8 +771,6 @@ int node_change_priority(struct node_object *hnode, s32 prio)
int status = 0;
u32 proc_id;
DBC_REQUIRE(refs > 0);
if (!hnode || !hnode->node_mgr) {
status = -EFAULT;
} else {
......@@ -854,7 +841,6 @@ int node_connect(struct node_object *node1, u32 stream1,
s8 chnl_mode;
u32 dw_length;
int status = 0;
DBC_REQUIRE(refs > 0);
if (!node1 || !node2)
return -EFAULT;
......@@ -1139,7 +1125,6 @@ int node_create(struct node_object *hnode)
omap_dspbridge_dev->dev.platform_data;
#endif
DBC_REQUIRE(refs > 0);
if (!pnode) {
status = -EFAULT;
goto func_end;
......@@ -1291,10 +1276,6 @@ int node_create_mgr(struct node_mgr **node_man,
int status = 0;
u8 dev_type;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(node_man != NULL);
DBC_REQUIRE(hdev_obj != NULL);
*node_man = NULL;
/* Allocate Node manager object */
node_mgr_obj = kzalloc(sizeof(struct node_mgr), GFP_KERNEL);
......@@ -1375,8 +1356,6 @@ int node_create_mgr(struct node_mgr **node_man,
*node_man = node_mgr_obj;
DBC_ENSURE((status && *node_man == NULL) || (!status && *node_man));
return status;
out_err:
delete_node_mgr(node_mgr_obj);
......@@ -1409,7 +1388,6 @@ int node_delete(struct node_res_object *noderes,
void *node_res = noderes;
struct dsp_processorstate proc_state;
DBC_REQUIRE(refs > 0);
if (!pnode) {
status = -EFAULT;
......@@ -1554,8 +1532,6 @@ int node_delete(struct node_res_object *noderes,
*/
int node_delete_mgr(struct node_mgr *hnode_mgr)
{
DBC_REQUIRE(refs > 0);
if (!hnode_mgr)
return -EFAULT;
......@@ -1576,10 +1552,6 @@ int node_enum_nodes(struct node_mgr *hnode_mgr, void **node_tab,
struct node_object *hnode;
u32 i = 0;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(node_tab != NULL || node_tab_size == 0);
DBC_REQUIRE(pu_num_nodes != NULL);
DBC_REQUIRE(pu_allocated != NULL);
if (!hnode_mgr) {
status = -EFAULT;
......@@ -1611,11 +1583,7 @@ int node_enum_nodes(struct node_mgr *hnode_mgr, void **node_tab,
*/
void node_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
DBC_ENSURE(refs >= 0);
}
/*
......@@ -1629,10 +1597,6 @@ int node_free_msg_buf(struct node_object *hnode, u8 * pbuffer,
struct node_object *pnode = (struct node_object *)hnode;
int status = 0;
u32 proc_id;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pbuffer != NULL);
DBC_REQUIRE(pnode != NULL);
DBC_REQUIRE(pnode->xlator != NULL);
if (!hnode) {
status = -EFAULT;
......@@ -1669,9 +1633,6 @@ int node_get_attr(struct node_object *hnode,
struct dsp_nodeattr *pattr, u32 attr_size)
{
struct node_mgr *hnode_mgr;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pattr != NULL);
DBC_REQUIRE(attr_size >= sizeof(struct dsp_nodeattr));
if (!hnode)
return -EFAULT;
......@@ -1713,9 +1674,6 @@ int node_get_channel_id(struct node_object *hnode, u32 dir, u32 index,
{
enum node_type node_type;
int status = -EINVAL;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(dir == DSP_TONODE || dir == DSP_FROMNODE);
DBC_REQUIRE(chan_id != NULL);
if (!hnode) {
status = -EFAULT;
......@@ -1761,9 +1719,6 @@ int node_get_message(struct node_object *hnode,
struct dsp_processorstate proc_state;
struct proc_object *hprocessor;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(message != NULL);
if (!hnode) {
status = -EFAULT;
goto func_end;
......@@ -1831,14 +1786,12 @@ int node_get_nldr_obj(struct node_mgr *hnode_mgr,
{
int status = 0;
struct node_mgr *node_mgr_obj = hnode_mgr;
DBC_REQUIRE(nldr_ovlyobj != NULL);
if (!hnode_mgr)
status = -EFAULT;
else
*nldr_ovlyobj = node_mgr_obj->nldr_obj;
DBC_ENSURE(!status || (nldr_ovlyobj != NULL && *nldr_ovlyobj == NULL));
return status;
}
......@@ -1852,8 +1805,6 @@ int node_get_strm_mgr(struct node_object *hnode,
{
int status = 0;
DBC_REQUIRE(refs > 0);
if (!hnode)
status = -EFAULT;
else
......@@ -1867,8 +1818,6 @@ int node_get_strm_mgr(struct node_object *hnode,
*/
enum nldr_loadtype node_get_load_type(struct node_object *hnode)
{
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hnode);
if (!hnode) {
dev_dbg(bridge, "%s: Failed. hnode: %p\n", __func__, hnode);
return -1;
......@@ -1884,8 +1833,6 @@ enum nldr_loadtype node_get_load_type(struct node_object *hnode)
*/
u32 node_get_timeout(struct node_object *hnode)
{
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hnode);
if (!hnode) {
dev_dbg(bridge, "%s: failed. hnode: %p\n", __func__, hnode);
return 0;
......@@ -1921,8 +1868,6 @@ enum node_type node_get_type(struct node_object *hnode)
*/
bool node_init(void)
{
DBC_REQUIRE(refs >= 0);
refs++;
return true;
......@@ -1970,8 +1915,6 @@ int node_pause(struct node_object *hnode)
struct dsp_processorstate proc_state;
struct proc_object *hprocessor;
DBC_REQUIRE(refs > 0);
if (!hnode) {
status = -EFAULT;
} else {
......@@ -2054,9 +1997,6 @@ int node_put_message(struct node_object *hnode,
struct dsp_processorstate proc_state;
struct proc_object *hprocessor;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pmsg != NULL);
if (!hnode) {
status = -EFAULT;
goto func_end;
......@@ -2146,9 +2086,6 @@ int node_register_notify(struct node_object *hnode, u32 event_mask,
struct bridge_drv_interface *intf_fxns;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hnotification != NULL);
if (!hnode) {
status = -EFAULT;
} else {
......@@ -2207,8 +2144,6 @@ int node_run(struct node_object *hnode)
struct dsp_processorstate proc_state;
struct proc_object *hprocessor;
DBC_REQUIRE(refs > 0);
if (!hnode) {
status = -EFAULT;
goto func_end;
......@@ -2326,9 +2261,6 @@ int node_terminate(struct node_object *hnode, int *pstatus)
struct deh_mgr *hdeh_mgr;
struct dsp_processorstate proc_state;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pstatus != NULL);
if (!hnode || !hnode->node_mgr) {
status = -EFAULT;
goto func_end;
......@@ -2748,9 +2680,6 @@ static int get_fxn_address(struct node_object *hnode, u32 * fxn_addr,
char *pstr_fxn_name = NULL;
struct node_mgr *hnode_mgr = hnode->node_mgr;
int status = 0;
DBC_REQUIRE(node_get_type(hnode) == NODE_TASK ||
node_get_type(hnode) == NODE_DAISSOCKET ||
node_get_type(hnode) == NODE_MESSAGE);
switch (phase) {
case CREATEPHASE:
......@@ -2787,9 +2716,6 @@ void get_node_info(struct node_object *hnode, struct dsp_nodeinfo *node_info)
{
u32 i;
DBC_REQUIRE(hnode);
DBC_REQUIRE(node_info != NULL);
node_info->cb_struct = sizeof(struct dsp_nodeinfo);
node_info->nb_node_database_props =
hnode->dcd_props.obj_data.node_obj.ndb_props;
......@@ -2848,7 +2774,6 @@ static int get_node_props(struct dcd_manager *hdcd_mgr,
pmsg_args->max_msgs);
} else {
/* Copy device name */
DBC_REQUIRE(pndb_props->ac_name);
len = strlen(pndb_props->ac_name);
DBC_ASSERT(len < MAXDEVNAMELEN);
hnode->str_dev_name = kzalloc(len + 1, GFP_KERNEL);
......@@ -2938,10 +2863,6 @@ int node_get_uuid_props(void *hprocessor,
struct dcd_nodeprops dcd_node_props;
struct dsp_processorstate proc_state;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hprocessor != NULL);
DBC_REQUIRE(node_uuid != NULL);
if (hprocessor == NULL || node_uuid == NULL) {
status = -EFAULT;
goto func_end;
......@@ -3063,8 +2984,6 @@ static u32 ovly(void *priv_ref, u32 dsp_run_addr, u32 dsp_load_addr,
/* Function interface to Bridge driver*/
struct bridge_drv_interface *intf_fxns;
DBC_REQUIRE(hnode);
hnode_mgr = hnode->node_mgr;
ul_size = ul_num_bytes / hnode_mgr->dsp_word_size;
......@@ -3106,9 +3025,6 @@ static u32 mem_write(void *priv_ref, u32 dsp_add, void *pbuf,
/* Function interface to Bridge driver */
struct bridge_drv_interface *intf_fxns;
DBC_REQUIRE(hnode);
DBC_REQUIRE(mem_space & DBLL_CODE || mem_space & DBLL_DATA);
hnode_mgr = hnode->node_mgr;
ul_timeout = hnode->timeout;
......
drivers/staging/tidspbridge/rmgr/proc.c
View file @ 276cc746
......@@ -281,9 +281,6 @@ proc_attach(u32 processor_id,
struct drv_data *drv_datap = dev_get_drvdata(bridge);
u8 dev_type;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(ph_processor != NULL);
if (pr_ctxt->processor) {
*ph_processor = pr_ctxt->processor;
return status;
......@@ -382,10 +379,6 @@ proc_attach(u32 processor_id,
kfree(p_proc_object);
}
func_end:
DBC_ENSURE((status == -EPERM && *ph_processor == NULL) ||
(!status && p_proc_object) ||
(status == 0 && p_proc_object));
return status;
}
......@@ -445,10 +438,6 @@ int proc_auto_start(struct cfg_devnode *dev_node_obj,
struct drv_data *drv_datap = dev_get_drvdata(bridge);
u8 dev_type;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(dev_node_obj != NULL);
DBC_REQUIRE(hdev_obj != NULL);
/* Create a Dummy PROC Object */
if (!drv_datap || !drv_datap->mgr_object) {
status = -ENODATA;
......@@ -516,8 +505,6 @@ int proc_ctrl(void *hprocessor, u32 dw_cmd, struct dsp_cbdata * arg)
struct proc_object *p_proc_object = hprocessor;
u32 timeout = 0;
DBC_REQUIRE(refs > 0);
if (p_proc_object) {
/* intercept PWR deep sleep command */
if (dw_cmd == BRDIOCTL_DEEPSLEEP) {
......@@ -565,8 +552,6 @@ int proc_detach(struct process_context *pr_ctxt)
int status = 0;
struct proc_object *p_proc_object = NULL;
DBC_REQUIRE(refs > 0);
p_proc_object = (struct proc_object *)pr_ctxt->processor;
if (p_proc_object) {
......@@ -607,11 +592,6 @@ int proc_enum_nodes(void *hprocessor, void **node_tab,
struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
struct node_mgr *hnode_mgr = NULL;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(node_tab != NULL || node_tab_size == 0);
DBC_REQUIRE(pu_num_nodes != NULL);
DBC_REQUIRE(pu_allocated != NULL);
if (p_proc_object) {
if (!(dev_get_node_manager(p_proc_object->dev_obj,
&hnode_mgr))) {
......@@ -768,8 +748,6 @@ int proc_begin_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
struct process_context *pr_ctxt = (struct process_context *) hprocessor;
struct dmm_map_object *map_obj;
DBC_REQUIRE(refs > 0);
if (!pr_ctxt) {
status = -EFAULT;
goto err_out;
......@@ -810,8 +788,6 @@ int proc_end_dma(void *hprocessor, void *pmpu_addr, u32 ul_size,
struct process_context *pr_ctxt = (struct process_context *) hprocessor;
struct dmm_map_object *map_obj;
DBC_REQUIRE(refs > 0);
if (!pr_ctxt) {
status = -EFAULT;
goto err_out;
......@@ -884,10 +860,6 @@ int proc_get_resource_info(void *hprocessor, u32 resource_type,
struct rmm_target_obj *rmm = NULL;
struct io_mgr *hio_mgr = NULL; /* IO manager handle */
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(resource_info != NULL);
DBC_REQUIRE(resource_info_size >= sizeof(struct dsp_resourceinfo));
if (!p_proc_object) {
status = -EFAULT;
goto func_end;
......@@ -947,11 +919,7 @@ int proc_get_resource_info(void *hprocessor, u32 resource_type,
*/
void proc_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
DBC_ENSURE(refs >= 0);
}
/*
......@@ -966,9 +934,6 @@ int proc_get_dev_object(void *hprocessor,
int status = -EPERM;
struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(device_obj != NULL);
if (p_proc_object) {
*device_obj = p_proc_object->dev_obj;
status = 0;
......@@ -977,9 +942,6 @@ int proc_get_dev_object(void *hprocessor,
status = -EFAULT;
}
DBC_ENSURE((!status && *device_obj != NULL) ||
(status && *device_obj == NULL));
return status;
}
......@@ -996,10 +958,6 @@ int proc_get_state(void *hprocessor,
struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
int brd_status;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(proc_state_obj != NULL);
DBC_REQUIRE(state_info_size >= sizeof(struct dsp_processorstate));
if (p_proc_object) {
/* First, retrieve BRD state information */
status = (*p_proc_object->intf_fxns->brd_status)
......@@ -1063,13 +1021,9 @@ bool proc_init(void)
{
bool ret = true;
DBC_REQUIRE(refs >= 0);
if (ret)
refs++;
DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
return ret;
}
......@@ -1111,10 +1065,6 @@ int proc_load(void *hprocessor, const s32 argc_index,
omap_dspbridge_dev->dev.platform_data;
#endif
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(argc_index > 0);
DBC_REQUIRE(user_args != NULL);
#ifdef OPT_LOAD_TIME_INSTRUMENTATION
do_gettimeofday(&tv1);
#endif
......@@ -1331,9 +1281,6 @@ int proc_load(void *hprocessor, const s32 argc_index,
pr_err("%s: Processor failed to load\n", __func__);
proc_stop(p_proc_object);
}
DBC_ENSURE((!status
&& p_proc_object->proc_state == PROC_LOADED)
|| status);
#ifdef OPT_LOAD_TIME_INSTRUMENTATION
do_gettimeofday(&tv2);
if (tv2.tv_usec < tv1.tv_usec) {
......@@ -1443,9 +1390,6 @@ int proc_register_notify(void *hprocessor, u32 event_mask,
struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
struct deh_mgr *hdeh_mgr;
DBC_REQUIRE(hnotification != NULL);
DBC_REQUIRE(refs > 0);
/* Check processor handle */
if (!p_proc_object) {
status = -EFAULT;
......@@ -1567,7 +1511,6 @@ int proc_start(void *hprocessor)
u32 dw_dsp_addr; /* Loaded code's entry point. */
int brd_state;
DBC_REQUIRE(refs > 0);
if (!p_proc_object) {
status = -EFAULT;
goto func_end;
......@@ -1624,8 +1567,6 @@ int proc_start(void *hprocessor)
}
func_end:
DBC_ENSURE((!status && p_proc_object->proc_state ==
PROC_RUNNING) || status);
return status;
}
......@@ -1646,7 +1587,6 @@ int proc_stop(void *hprocessor)
u32 nodes_allocated = 0;
int brd_state;
DBC_REQUIRE(refs > 0);
if (!p_proc_object) {
status = -EFAULT;
goto func_end;
......@@ -1822,9 +1762,6 @@ static int proc_monitor(struct proc_object *proc_obj)
struct msg_mgr *hmsg_mgr;
int brd_state;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(proc_obj);
/* This is needed only when Device is loaded when it is
* already 'ACTIVE' */
/* Destroy the Node Manager, msg_ctrl Manager */
......@@ -1845,8 +1782,6 @@ static int proc_monitor(struct proc_object *proc_obj)
DBC_ASSERT(brd_state == BRD_IDLE);
}
DBC_ENSURE((!status && brd_state == BRD_IDLE) ||
status);
return status;
}
......@@ -1880,8 +1815,6 @@ static char **prepend_envp(char **new_envp, char **envp, s32 envp_elems,
{
char **pp_envp = new_envp;
DBC_REQUIRE(new_envp);
/* Prepend new environ var=value string */
*new_envp++ = sz_var;
......@@ -1906,9 +1839,6 @@ int proc_notify_clients(void *proc, u32 events)
int status = 0;
struct proc_object *p_proc_object = (struct proc_object *)proc;
DBC_REQUIRE(p_proc_object);
DBC_REQUIRE(is_valid_proc_event(events));
DBC_REQUIRE(refs > 0);
if (!p_proc_object) {
status = -EFAULT;
goto func_end;
......@@ -1930,9 +1860,6 @@ int proc_notify_all_clients(void *proc, u32 events)
int status = 0;
struct proc_object *p_proc_object = (struct proc_object *)proc;
DBC_REQUIRE(is_valid_proc_event(events));
DBC_REQUIRE(refs > 0);
if (!p_proc_object) {
status = -EFAULT;
goto func_end;
......
drivers/staging/tidspbridge/rmgr/rmm.c
View file @ 276cc746
......@@ -101,12 +101,6 @@ int rmm_alloc(struct rmm_target_obj *target, u32 segid, u32 size,
u32 addr;
int status = 0;
DBC_REQUIRE(target);
DBC_REQUIRE(dsp_address != NULL);
DBC_REQUIRE(size > 0);
DBC_REQUIRE(reserve || (target->num_segs > 0));
DBC_REQUIRE(refs > 0);
if (!reserve) {
if (!alloc_block(target, segid, size, align, dsp_address)) {
status = -ENOMEM;
......@@ -170,9 +164,6 @@ int rmm_create(struct rmm_target_obj **target_obj,
s32 i;
int status = 0;
DBC_REQUIRE(target_obj != NULL);
DBC_REQUIRE(num_segs == 0 || seg_tab != NULL);
/* Allocate DBL target object */
target = kzalloc(sizeof(struct rmm_target_obj), GFP_KERNEL);
......@@ -235,9 +226,6 @@ int rmm_create(struct rmm_target_obj **target_obj,
}
DBC_ENSURE((!status && *target_obj)
|| (status && *target_obj == NULL));
return status;
}
......@@ -251,8 +239,6 @@ void rmm_delete(struct rmm_target_obj *target)
struct rmm_header *next;
u32 i;
DBC_REQUIRE(target);
kfree(target->seg_tab);
list_for_each_entry_safe(sect, tmp, &target->ovly_list, list_elem) {
......@@ -281,11 +267,7 @@ void rmm_delete(struct rmm_target_obj *target)
*/
void rmm_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
DBC_ENSURE(refs >= 0);
}
/*
......@@ -297,15 +279,6 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size,
struct rmm_ovly_sect *sect, *tmp;
bool ret = false;
DBC_REQUIRE(target);
DBC_REQUIRE(reserved || segid < target->num_segs);
DBC_REQUIRE(reserved || (dsp_addr >= target->seg_tab[segid].base &&
(dsp_addr + size) <= (target->seg_tab[segid].
base +
target->seg_tab[segid].
length)));
/*
* Free or unreserve memory.
*/
......@@ -335,8 +308,6 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size,
*/
bool rmm_init(void)
{
DBC_REQUIRE(refs >= 0);
refs++;
return true;
......@@ -354,7 +325,6 @@ bool rmm_stat(struct rmm_target_obj *target, enum dsp_memtype segid,
u32 total_free_size = 0;
u32 free_blocks = 0;
DBC_REQUIRE(mem_stat_buf != NULL);
DBC_ASSERT(target != NULL);
if ((u32) segid < target->num_segs) {
......
drivers/staging/tidspbridge/rmgr/strm.c
View file @ 276cc746
......@@ -104,9 +104,6 @@ int strm_allocate_buffer(struct strm_res_object *strmres, u32 usize,
u32 i;
struct strm_object *stream_obj = strmres->stream;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(ap_buffer != NULL);
if (stream_obj) {
/*
* Allocate from segment specified at time of stream open.
......@@ -156,8 +153,6 @@ int strm_close(struct strm_res_object *strmres,
int status = 0;
struct strm_object *stream_obj = strmres->stream;
DBC_REQUIRE(refs > 0);
if (!stream_obj) {
status = -EFAULT;
} else {
......@@ -180,9 +175,6 @@ int strm_close(struct strm_res_object *strmres,
idr_remove(pr_ctxt->stream_id, strmres->id);
func_end:
DBC_ENSURE(status == 0 || status == -EFAULT ||
status == -EPIPE || status == -EPERM);
dev_dbg(bridge, "%s: stream_obj: %p, status 0x%x\n", __func__,
stream_obj, status);
return status;
......@@ -199,10 +191,6 @@ int strm_create(struct strm_mgr **strm_man,
struct strm_mgr *strm_mgr_obj;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(strm_man != NULL);
DBC_REQUIRE(dev_obj != NULL);
*strm_man = NULL;
/* Allocate STRM manager object */
strm_mgr_obj = kzalloc(sizeof(struct strm_mgr), GFP_KERNEL);
......@@ -226,8 +214,6 @@ int strm_create(struct strm_mgr **strm_man,
else
kfree(strm_mgr_obj);
DBC_ENSURE((!status && *strm_man) || (status && *strm_man == NULL));
return status;
}
......@@ -238,9 +224,6 @@ int strm_create(struct strm_mgr **strm_man,
*/
void strm_delete(struct strm_mgr *strm_mgr_obj)
{
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(strm_mgr_obj);
kfree(strm_mgr_obj);
}
......@@ -251,11 +234,7 @@ void strm_delete(struct strm_mgr *strm_mgr_obj)
*/
void strm_exit(void)
{
DBC_REQUIRE(refs > 0);
refs--;
DBC_ENSURE(refs >= 0);
}
/*
......@@ -270,9 +249,6 @@ int strm_free_buffer(struct strm_res_object *strmres, u8 ** ap_buffer,
u32 i = 0;
struct strm_object *stream_obj = strmres->stream;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(ap_buffer != NULL);
if (!stream_obj)
status = -EFAULT;
......@@ -306,10 +282,6 @@ int strm_get_info(struct strm_object *stream_obj,
int status = 0;
void *virt_base = NULL; /* NULL if no SM used */
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(stream_info != NULL);
DBC_REQUIRE(stream_info_size >= sizeof(struct stream_info));
if (!stream_obj) {
status = -EFAULT;
} else {
......@@ -370,8 +342,6 @@ int strm_idle(struct strm_object *stream_obj, bool flush_data)
struct bridge_drv_interface *intf_fxns;
int status = 0;
DBC_REQUIRE(refs > 0);
if (!stream_obj) {
status = -EFAULT;
} else {
......@@ -396,13 +366,9 @@ bool strm_init(void)
{
bool ret = true;
DBC_REQUIRE(refs >= 0);
if (ret)
refs++;
DBC_ENSURE((ret && (refs > 0)) || (!ret && (refs >= 0)));
return ret;
}
......@@ -418,9 +384,6 @@ int strm_issue(struct strm_object *stream_obj, u8 *pbuf, u32 ul_bytes,
int status = 0;
void *tmp_buf = NULL;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(pbuf != NULL);
if (!stream_obj) {
status = -EFAULT;
} else {
......@@ -471,9 +434,6 @@ int strm_open(struct node_object *hnode, u32 dir, u32 index,
void *stream_res;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(strmres != NULL);
DBC_REQUIRE(pattr != NULL);
*strmres = NULL;
if (dir != DSP_TONODE && dir != DSP_FROMNODE) {
status = -EPERM;
......@@ -594,12 +554,6 @@ int strm_open(struct node_object *hnode, u32 dir, u32 index,
(void)delete_strm(strm_obj);
}
/* ensure we return a documented error code */
DBC_ENSURE((!status && strm_obj) ||
(*strmres == NULL && (status == -EFAULT ||
status == -EPERM
|| status == -EINVAL)));
dev_dbg(bridge, "%s: hnode: %p dir: 0x%x index: 0x%x pattr: %p "
"strmres: %p status: 0x%x\n", __func__,
hnode, dir, index, pattr, strmres, status);
......@@ -619,11 +573,6 @@ int strm_reclaim(struct strm_object *stream_obj, u8 ** buf_ptr,
int status = 0;
void *tmp_buf = NULL;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(buf_ptr != NULL);
DBC_REQUIRE(nbytes != NULL);
DBC_REQUIRE(pdw_arg != NULL);
if (!stream_obj) {
status = -EFAULT;
goto func_end;
......@@ -679,11 +628,6 @@ int strm_reclaim(struct strm_object *stream_obj, u8 ** buf_ptr,
*buf_ptr = chnl_ioc_obj.buf;
}
func_end:
/* ensure we return a documented return code */
DBC_ENSURE(!status || status == -EFAULT ||
status == -ETIME || status == -ESRCH ||
status == -EPERM);
dev_dbg(bridge, "%s: stream_obj: %p buf_ptr: %p nbytes: %p "
"pdw_arg: %p status 0x%x\n", __func__, stream_obj,
buf_ptr, nbytes, pdw_arg, status);
......@@ -702,9 +646,6 @@ int strm_register_notify(struct strm_object *stream_obj, u32 event_mask,
struct bridge_drv_interface *intf_fxns;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hnotification != NULL);
if (!stream_obj) {
status = -EFAULT;
} else if ((event_mask & ~((DSP_STREAMIOCOMPLETION) |
......@@ -725,10 +666,7 @@ int strm_register_notify(struct strm_object *stream_obj, u32 event_mask,
notify_type,
hnotification);
}
/* ensure we return a documented return code */
DBC_ENSURE(!status || status == -EFAULT ||
status == -ETIME || status == -ESRCH ||
status == -ENOSYS || status == -EPERM);
return status;
}
......@@ -747,11 +685,6 @@ int strm_select(struct strm_object **strm_tab, u32 strms,
u32 i;
int status = 0;
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(strm_tab != NULL);
DBC_REQUIRE(pmask != NULL);
DBC_REQUIRE(strms > 0);
*pmask = 0;
for (i = 0; i < strms; i++) {
if (!strm_tab[i]) {
......@@ -811,9 +744,6 @@ int strm_select(struct strm_object **strm_tab, u32 strms,
func_end:
kfree(sync_events);
DBC_ENSURE((!status && (*pmask != 0 || utimeout == 0)) ||
(status && *pmask == 0));
return status;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7