aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/tidspbridge/rmgr/disp.c
diff options
context:
space:
mode:
authorErnesto Ramos <ernesto@ti.com>2010-07-28 10:45:31 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-28 11:22:43 -0400
commitb66e0986f900db194f637149e68c00345863195b (patch)
tree9890662fe9573f1e872604dc3acd5015925820ab /drivers/staging/tidspbridge/rmgr/disp.c
parent51d5e099cc9a21960e59bcaee6cc5e2620ea6bb2 (diff)
staging:ti dspbridge: remove DSP_FAILED macro from rmgr
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>
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr/disp.c')
-rw-r--r--drivers/staging/tidspbridge/rmgr/disp.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c
index 2d479b226c7..b7ce4353e06 100644
--- a/drivers/staging/tidspbridge/rmgr/disp.c
+++ b/drivers/staging/tidspbridge/rmgr/disp.c
@@ -121,12 +121,12 @@ int disp_create(struct disp_object **dispatch_obj,
121 121
122 /* check device type and decide if streams or messag'ing is used for 122 /* check device type and decide if streams or messag'ing is used for
123 * RMS/EDS */ 123 * RMS/EDS */
124 if (DSP_FAILED(status)) 124 if (status)
125 goto func_cont; 125 goto func_cont;
126 126
127 status = dev_get_dev_type(hdev_obj, &dev_type); 127 status = dev_get_dev_type(hdev_obj, &dev_type);
128 128
129 if (DSP_FAILED(status)) 129 if (status)
130 goto func_cont; 130 goto func_cont;
131 131
132 if (dev_type != DSP_UNIT) { 132 if (dev_type != DSP_UNIT) {
@@ -168,7 +168,7 @@ func_cont:
168 else 168 else
169 delete_disp(disp_obj); 169 delete_disp(disp_obj);
170 170
171 DBC_ENSURE(((DSP_FAILED(status)) && ((*dispatch_obj == NULL))) || 171 DBC_ENSURE((status && *dispatch_obj == NULL) ||
172 (!status && *dispatch_obj)); 172 (!status && *dispatch_obj));
173 return status; 173 return status;
174} 174}
@@ -284,7 +284,7 @@ int disp_node_create(struct disp_object *disp_obj,
284 284
285 status = dev_get_dev_type(disp_obj->hdev_obj, &dev_type); 285 status = dev_get_dev_type(disp_obj->hdev_obj, &dev_type);
286 286
287 if (DSP_FAILED(status)) 287 if (status)
288 goto func_end; 288 goto func_end;
289 289
290 if (dev_type != DSP_UNIT) { 290 if (dev_type != DSP_UNIT) {
@@ -377,7 +377,7 @@ int disp_node_create(struct disp_object *disp_obj,
377 node_msg_args.arg_length); 377 node_msg_args.arg_length);
378 total += dw_length; 378 total += dw_length;
379 } 379 }
380 if (DSP_FAILED(status)) 380 if (status)
381 goto func_end; 381 goto func_end;
382 382
383 /* If node is a task node, copy task create arguments into buffer */ 383 /* If node is a task node, copy task create arguments into buffer */
@@ -425,7 +425,7 @@ int disp_node_create(struct disp_object *disp_obj,
425 /* Fill SIO defs and offsets */ 425 /* Fill SIO defs and offsets */
426 offset = sio_defs_offset; 426 offset = sio_defs_offset;
427 for (i = 0; i < task_arg_obj.num_inputs; i++) { 427 for (i = 0; i < task_arg_obj.num_inputs; i++) {
428 if (DSP_FAILED(status)) 428 if (status)
429 break; 429 break;
430 430
431 pdw_buf[sio_in_def_offset + i] = 431 pdw_buf[sio_in_def_offset + i] =
@@ -467,7 +467,7 @@ int disp_node_create(struct disp_object *disp_obj,
467 * on the DSP-side 467 * on the DSP-side
468 */ 468 */
469 status = (((rms_word *) (disp_obj->pbuf))[0]); 469 status = (((rms_word *) (disp_obj->pbuf))[0]);
470 if (DSP_FAILED(status)) 470 if (status < 0)
471 dev_dbg(bridge, "%s: DSP-side failed: 0x%x\n", 471 dev_dbg(bridge, "%s: DSP-side failed: 0x%x\n",
472 __func__, status); 472 __func__, status);
473 } 473 }
@@ -520,7 +520,7 @@ int disp_node_delete(struct disp_object *disp_obj,
520 * function on the DSP-side 520 * function on the DSP-side
521 */ 521 */
522 status = (((rms_word *) (disp_obj->pbuf))[0]); 522 status = (((rms_word *) (disp_obj->pbuf))[0]);
523 if (DSP_FAILED(status)) 523 if (status < 0)
524 dev_dbg(bridge, "%s: DSP-side failed: " 524 dev_dbg(bridge, "%s: DSP-side failed: "
525 "0x%x\n", __func__, status); 525 "0x%x\n", __func__, status);
526 } 526 }
@@ -573,7 +573,7 @@ int disp_node_run(struct disp_object *disp_obj,
573 * function on the DSP-side 573 * function on the DSP-side
574 */ 574 */
575 status = (((rms_word *) (disp_obj->pbuf))[0]); 575 status = (((rms_word *) (disp_obj->pbuf))[0]);
576 if (DSP_FAILED(status)) 576 if (status < 0)
577 dev_dbg(bridge, "%s: DSP-side failed: " 577 dev_dbg(bridge, "%s: DSP-side failed: "
578 "0x%x\n", __func__, status); 578 "0x%x\n", __func__, status);
579 } 579 }
@@ -603,7 +603,7 @@ static void delete_disp(struct disp_object *disp_obj)
603 * is invalid. */ 603 * is invalid. */
604 status = (*intf_fxns->pfn_chnl_close) 604 status = (*intf_fxns->pfn_chnl_close)
605 (disp_obj->chnl_from_dsp); 605 (disp_obj->chnl_from_dsp);
606 if (DSP_FAILED(status)) { 606 if (status) {
607 dev_dbg(bridge, "%s: Failed to close channel " 607 dev_dbg(bridge, "%s: Failed to close channel "
608 "from RMS: 0x%x\n", __func__, status); 608 "from RMS: 0x%x\n", __func__, status);
609 } 609 }
@@ -612,7 +612,7 @@ static void delete_disp(struct disp_object *disp_obj)
612 status = 612 status =
613 (*intf_fxns->pfn_chnl_close) (disp_obj-> 613 (*intf_fxns->pfn_chnl_close) (disp_obj->
614 chnl_to_dsp); 614 chnl_to_dsp);
615 if (DSP_FAILED(status)) { 615 if (status) {
616 dev_dbg(bridge, "%s: Failed to close channel to" 616 dev_dbg(bridge, "%s: Failed to close channel to"
617 " RMS: 0x%x\n", __func__, status); 617 " RMS: 0x%x\n", __func__, status);
618 } 618 }
@@ -704,7 +704,7 @@ static int send_message(struct disp_object *disp_obj, u32 timeout,
704 /* Send the command */ 704 /* Send the command */
705 status = (*intf_fxns->pfn_chnl_add_io_req) (chnl_obj, pbuf, ul_bytes, 0, 705 status = (*intf_fxns->pfn_chnl_add_io_req) (chnl_obj, pbuf, ul_bytes, 0,
706 0L, dw_arg); 706 0L, dw_arg);
707 if (DSP_FAILED(status)) 707 if (status)
708 goto func_end; 708 goto func_end;
709 709
710 status = 710 status =
@@ -718,14 +718,14 @@ static int send_message(struct disp_object *disp_obj, u32 timeout,
718 } 718 }
719 } 719 }
720 /* Get the reply */ 720 /* Get the reply */
721 if (DSP_FAILED(status)) 721 if (status)
722 goto func_end; 722 goto func_end;
723 723
724 chnl_obj = disp_obj->chnl_from_dsp; 724 chnl_obj = disp_obj->chnl_from_dsp;
725 ul_bytes = REPLYSIZE; 725 ul_bytes = REPLYSIZE;
726 status = (*intf_fxns->pfn_chnl_add_io_req) (chnl_obj, pbuf, ul_bytes, 726 status = (*intf_fxns->pfn_chnl_add_io_req) (chnl_obj, pbuf, ul_bytes,
727 0, 0L, dw_arg); 727 0, 0L, dw_arg);
728 if (DSP_FAILED(status)) 728 if (status)
729 goto func_end; 729 goto func_end;
730 730
731 status = 731 status =