Skip to content

Commit

Permalink
staging:ti dspbridge: remove DSP_FAILED macro from core
Browse files Browse the repository at this point in the history 
Since status succeeded is 0, DSP_FAILED macro
is not necessary anymore.

Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ernesto Ramos authored and Greg Kroah-Hartman committed Jul 28, 2010
1 parent 54621f0 commit d1b2216
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 47 deletions.
20 changes: 10 additions & 10 deletions drivers/staging/tidspbridge/core/chnl_sm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ int bridge_chnl_add_io_req(struct chnl_object *chnl_obj, void *host_buf,
if (!dev_ctxt)
status = -EFAULT;

if (DSP_FAILED(status))
if (status)
goto func_end;

if (pchnl->chnl_type == CHNL_PCPY && pchnl->chnl_id > 1 && host_buf) {
Expand Down Expand Up @@ -266,7 +266,7 @@ int bridge_chnl_cancel_io(struct chnl_object *chnl_obj)
} else {
status = -EFAULT;
}
if (DSP_FAILED(status))
if (status)
goto func_end;

/* Mark this channel as cancelled, to prevent further IORequests or
Expand Down Expand Up @@ -372,7 +372,7 @@ int bridge_chnl_close(struct chnl_object *chnl_obj)
kfree(pchnl);
pchnl = NULL;
}
DBC_ENSURE(DSP_FAILED(status) || !pchnl);
DBC_ENSURE(status || !pchnl);
return status;
}

Expand Down Expand Up @@ -428,7 +428,7 @@ int bridge_chnl_create(struct chnl_mgr **channel_mgr,
status = -ENOMEM;
}

if (DSP_FAILED(status)) {
if (status) {
bridge_chnl_destroy(chnl_mgr_obj);
*channel_mgr = NULL;
} else {
Expand Down Expand Up @@ -456,7 +456,7 @@ int bridge_chnl_destroy(struct chnl_mgr *hchnl_mgr)
status =
bridge_chnl_close(chnl_mgr_obj->ap_channel
[chnl_id]);
if (DSP_FAILED(status))
if (status)
dev_dbg(bridge, "%s: Error status 0x%x\n",
__func__, status);
}
Expand Down Expand Up @@ -509,7 +509,7 @@ int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 timeout)
while (!LST_IS_EMPTY(pchnl->pio_requests) && !status) {
status = bridge_chnl_get_ioc(chnl_obj,
timeout, &chnl_ioc_obj);
if (DSP_FAILED(status))
if (status)
continue;

if (chnl_ioc_obj.status & CHNL_IOCSTATTIMEOUT)
Expand All @@ -522,7 +522,7 @@ int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 timeout)
pchnl->dw_state &= ~CHNL_STATECANCEL;
}
}
DBC_ENSURE(DSP_FAILED(status) || LST_IS_EMPTY(pchnl->pio_requests));
DBC_ENSURE(status || LST_IS_EMPTY(pchnl->pio_requests));
return status;
}

Expand Down Expand Up @@ -592,7 +592,7 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 timeout,
if (!dev_ctxt)
status = -EFAULT;

if (DSP_FAILED(status))
if (status)
goto func_end;

ioc.status = CHNL_IOCSTATCOMPLETE;
Expand Down Expand Up @@ -806,7 +806,7 @@ int bridge_chnl_open(struct chnl_object **chnl,
}
}
}
if (DSP_FAILED(status))
if (status)
goto func_end;

DBC_ASSERT(ch_id < chnl_mgr_obj->max_channels);
Expand Down Expand Up @@ -860,7 +860,7 @@ int bridge_chnl_open(struct chnl_object **chnl,
}
}

if (DSP_FAILED(status)) {
if (status) {
/* Free memory */
if (pchnl->pio_completions) {
free_chirp_list(pchnl->pio_completions);
Expand Down
64 changes: 32 additions & 32 deletions drivers/staging/tidspbridge/core/io_sm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ int bridge_io_create(struct io_mgr **io_man,
status = -EIO;
}
func_end:
if (DSP_FAILED(status)) {
if (status) {
/* Cleanup */
bridge_io_destroy(pio_mgr);
if (io_man)
Expand Down Expand Up @@ -357,13 +357,13 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
/* Get start and length of channel part of shared memory */
status = cod_get_sym_value(cod_man, CHNL_SHARED_BUFFER_BASE_SYM,
&ul_shm_base);
if (DSP_FAILED(status)) {
if (status) {
status = -EFAULT;
goto func_end;
}
status = cod_get_sym_value(cod_man, CHNL_SHARED_BUFFER_LIMIT_SYM,
&ul_shm_limit);
if (DSP_FAILED(status)) {
if (status) {
status = -EFAULT;
goto func_end;
}
Expand Down Expand Up @@ -414,18 +414,18 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
status = cod_get_sym_value(cod_man, SHM0_SHARED_END_SYM,
&shm0_end);
#endif
if (DSP_FAILED(status))
if (status)
status = -EFAULT;
}
if (!status) {
status =
cod_get_sym_value(cod_man, DYNEXTBASE, &ul_dyn_ext_base);
if (DSP_FAILED(status))
if (status)
status = -EFAULT;
}
if (!status) {
status = cod_get_sym_value(cod_man, EXTEND, &ul_ext_end);
if (DSP_FAILED(status))
if (status)
status = -EFAULT;
}
if (!status) {
Expand Down Expand Up @@ -469,7 +469,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
status = -ENOMEM;
}
}
if (DSP_FAILED(status))
if (status)
goto func_end;

pa_curr = ul_gpp_pa;
Expand Down Expand Up @@ -508,7 +508,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
pa_curr, va_curr,
page_size[i], map_attrs,
NULL);
if (DSP_FAILED(status))
if (status)
goto func_end;
pa_curr += page_size[i];
va_curr += page_size[i];
Expand Down Expand Up @@ -581,7 +581,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
ae_proc[ndx].ul_gpp_va,
ae_proc[ndx].ul_dsp_va *
hio_mgr->word_size, page_size[i]);
if (DSP_FAILED(status))
if (status)
goto func_end;
}
pa_curr += page_size[i];
Expand Down Expand Up @@ -645,7 +645,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
NULL);
}
}
if (DSP_FAILED(status))
if (status)
goto func_end;
}

Expand All @@ -662,7 +662,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
(hio_mgr->hbridge_context, l4_peripheral_table[i].phys_addr,
l4_peripheral_table[i].dsp_virt_addr, HW_PAGE_SIZE4KB,
map_attrs, NULL);
if (DSP_FAILED(status))
if (status)
goto func_end;
i++;
}
Expand Down Expand Up @@ -707,7 +707,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
hio_mgr->intf_fxns->pfn_dev_cntrl(hio_mgr->hbridge_context,
BRDIOCTL_SETMMUCONFIG,
ae_proc);
if (DSP_FAILED(status))
if (status)
goto func_end;
ul_shm_base = hio_mgr->ext_proc_info.ty_tlb[0].ul_gpp_phys;
ul_shm_base += ul_shm_base_offset;
Expand Down Expand Up @@ -756,7 +756,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
/* Get the start address of trace buffer */
status = cod_get_sym_value(cod_man, SYS_PUTCBEG,
&hio_mgr->ul_trace_buffer_begin);
if (DSP_FAILED(status)) {
if (status) {
status = -EFAULT;
goto func_end;
}
Expand All @@ -767,7 +767,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
/* Get the end address of trace buffer */
status = cod_get_sym_value(cod_man, SYS_PUTCEND,
&hio_mgr->ul_trace_buffer_end);
if (DSP_FAILED(status)) {
if (status) {
status = -EFAULT;
goto func_end;
}
Expand All @@ -777,7 +777,7 @@ int bridge_io_on_loaded(struct io_mgr *hio_mgr)
/* Get the current address of DSP write pointer */
status = cod_get_sym_value(cod_man, BRIDGE_SYS_PUTC_CURRENT,
&hio_mgr->ul_trace_buffer_current);
if (DSP_FAILED(status)) {
if (status) {
status = -EFAULT;
goto func_end;
}
Expand Down Expand Up @@ -852,7 +852,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
status = pio_mgr->intf_fxns->
pfn_dev_cntrl(pio_mgr->hbridge_context,
BRDIOCTL_PWR_HIBERNATE, parg);
if (DSP_FAILED(status))
if (status)
pr_err("%s: hibernate cmd failed 0x%x\n",
__func__, status);
} else if (parg[0] == MBX_PM_OPP_REQ) {
Expand All @@ -861,16 +861,16 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
status = pio_mgr->intf_fxns->
pfn_dev_cntrl(pio_mgr->hbridge_context,
BRDIOCTL_CONSTRAINT_REQUEST, parg);
if (DSP_FAILED(status))
if (status)
dev_dbg(bridge, "PM: Failed to set constraint "
"= 0x%x \n", parg[1]);
"= 0x%x\n", parg[1]);
} else {
dev_dbg(bridge, "PM: clk control value of msg = 0x%x\n",
parg[0]);
status = pio_mgr->intf_fxns->
pfn_dev_cntrl(pio_mgr->hbridge_context,
BRDIOCTL_CLK_CTRL, parg);
if (DSP_FAILED(status))
if (status)
dev_dbg(bridge, "PM: Failed to ctrl the DSP clk"
"= 0x%x\n", *parg);
}
Expand Down Expand Up @@ -1849,15 +1849,15 @@ int print_dsp_trace_buffer(struct bridge_dev_context *hbridge_context)
status = cod_get_sym_value(cod_mgr, COD_TRACECURPOS,
&trace_cur_pos);

if (DSP_FAILED(status))
if (status)
goto func_end;

ul_num_bytes = (ul_trace_end - ul_trace_begin);

ul_num_words = ul_num_bytes * ul_word_size;
status = dev_get_intf_fxns(dev_obj, &intf_fxns);

if (DSP_FAILED(status))
if (status)
goto func_end;

psz_buf = kzalloc(ul_num_bytes + 2, GFP_ATOMIC);
Expand All @@ -1867,7 +1867,7 @@ int print_dsp_trace_buffer(struct bridge_dev_context *hbridge_context)
(u8 *)psz_buf, (u32)ul_trace_begin,
ul_num_bytes, 0);

if (DSP_FAILED(status))
if (status)
goto func_end;

/* Pack and do newline conversion */
Expand All @@ -1881,7 +1881,7 @@ int print_dsp_trace_buffer(struct bridge_dev_context *hbridge_context)
status = (*intf_fxns->pfn_brd_read)(pbridge_context,
(u8 *)&trace_cur_pos, (u32)trace_cur_pos,
4, 0);
if (DSP_FAILED(status))
if (status)
goto func_end;
/* Pack and do newline conversion */
pr_info("DSP Trace Buffer Begin:\n"
Expand Down Expand Up @@ -1967,7 +1967,7 @@ int print_dsp_trace_buffer(struct bridge_dev_context *hbridge_context)
status = -ENOMEM;
}
func_end:
if (DSP_FAILED(status))
if (status)
dev_dbg(bridge, "%s Failed, status 0x%x\n", __func__, status);
return status;
}
Expand Down Expand Up @@ -2025,7 +2025,7 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context)
cod_get_sym_value(code_mgr, COD_TRACEBEG, &trace_begin);
pr_debug("%s: trace_begin Value 0x%x\n",
__func__, trace_begin);
if (DSP_FAILED(status))
if (status)
pr_debug("%s: Failed on cod_get_sym_value.\n",
__func__);
}
Expand All @@ -2049,7 +2049,7 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context)
(u8 *)&mmu_fault_dbg_info, (u32)trace_begin,
sizeof(mmu_fault_dbg_info), 0);

if (DSP_FAILED(status))
if (status)
break;

poll_cnt++;
Expand Down Expand Up @@ -2084,7 +2084,7 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context)
status = (*intf_fxns->pfn_brd_read)(bridge_context,
(u8 *)buffer, (u32)trace_begin,
total_size, 0);
if (DSP_FAILED(status)) {
if (status) {
pr_debug("%s: Failed to Read Trace Buffer.\n",
__func__);
goto func_end;
Expand All @@ -2101,7 +2101,7 @@ int dump_dsp_stack(struct bridge_dev_context *bridge_context)

status =
cod_get_sym_value(code_mgr, DYNEXTBASE, &dyn_ext_base);
if (DSP_FAILED(status)) {
if (status) {
status = -EFAULT;
goto func_end;
}
Expand Down Expand Up @@ -2219,7 +2219,7 @@ void dump_dl_modules(struct bridge_dev_context *bridge_context)
int status = 0;

status = dev_get_intf_fxns(dev_object, &intf_fxns);
if (DSP_FAILED(status)) {
if (status) {
pr_debug("%s: Failed on dev_get_intf_fxns.\n", __func__);
goto func_end;
}
Expand All @@ -2233,7 +2233,7 @@ void dump_dl_modules(struct bridge_dev_context *bridge_context)

/* Lookup the address of the modules_header structure */
status = cod_get_sym_value(code_mgr, "_DLModules", &module_dsp_addr);
if (DSP_FAILED(status)) {
if (status) {
pr_debug("%s: Failed on cod_get_sym_value for _DLModules.\n",
__func__);
goto func_end;
Expand All @@ -2245,7 +2245,7 @@ void dump_dl_modules(struct bridge_dev_context *bridge_context)
status = (*intf_fxns->pfn_brd_read)(bridge_context, (u8 *) &modules_hdr,
(u32) module_dsp_addr, sizeof(modules_hdr), 0);

if (DSP_FAILED(status)) {
if (status) {
pr_debug("%s: Failed failed to read modules header.\n",
__func__);
goto func_end;
Expand Down Expand Up @@ -2280,7 +2280,7 @@ void dump_dl_modules(struct bridge_dev_context *bridge_context)
status = (*intf_fxns->pfn_brd_read)(bridge_context,
(u8 *)module_struct, module_dsp_addr, module_size, 0);

if (DSP_FAILED(status)) {
if (status) {
pr_debug(
"%s: Failed to read dll_module stuct for 0x%x.\n",
__func__, module_dsp_addr);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/tidspbridge/core/msg_sm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
status = add_new_msg(msg_q->msg_free_list);
}
}
if (DSP_FAILED(status)) {
if (status) {
/* Stay inside CS to prevent others from taking any
* of the newly allocated message frames. */
delete_msg_queue(msg_q, num_allocated);
Expand Down Expand Up @@ -439,7 +439,7 @@ int bridge_msg_put(struct msg_queue *msg_queue_obj,
syncs[1] = msg_queue_obj->sync_done;
status = sync_wait_on_multiple_events(syncs, 2, utimeout,
&index);
if (DSP_FAILED(status))
if (status)
goto func_end;
/* Enter critical section */
spin_lock_bh(&hmsg_mgr->msg_mgr_lock);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/tidspbridge/core/tiomap3430.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,7 @@ static int bridge_brd_mem_map(struct bridge_dev_context *dev_ctxt,
}
status = pte_set(dev_context->pt_attrs, pa,
va, HW_PAGE_SIZE4KB, &hw_attrs);
if (DSP_FAILED(status))
if (status)
break;

va += HW_PAGE_SIZE4KB;
Expand All @@ -1344,7 +1344,7 @@ static int bridge_brd_mem_map(struct bridge_dev_context *dev_ctxt,
status = pte_set(dev_context->pt_attrs,
page_to_phys(mapped_page), va,
HW_PAGE_SIZE4KB, &hw_attrs);
if (DSP_FAILED(status))
if (status)
break;

if (mapped_pages)
Expand Down
Loading

0 comments on commit d1b2216

Please sign in to comment.