aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/tidspbridge/rmgr/proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr/proc.c')
-rw-r--r--drivers/staging/tidspbridge/rmgr/proc.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index 4e2f2e450b2..8da5db6fe07 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -1152,8 +1152,6 @@ int proc_load(void *hprocessor, const s32 argc_index,
1152 if (status) { 1152 if (status) {
1153 status = -EPERM; 1153 status = -EPERM;
1154 } else { 1154 } else {
1155 DBC_ASSERT(p_proc_object->last_coff ==
1156 NULL);
1157 /* Allocate memory for pszLastCoff */ 1155 /* Allocate memory for pszLastCoff */
1158 p_proc_object->last_coff = 1156 p_proc_object->last_coff =
1159 kzalloc((strlen(user_args[0]) + 1157 kzalloc((strlen(user_args[0]) +
@@ -1176,7 +1174,6 @@ int proc_load(void *hprocessor, const s32 argc_index,
1176 if (!hmsg_mgr) { 1174 if (!hmsg_mgr) {
1177 status = msg_create(&hmsg_mgr, p_proc_object->dev_obj, 1175 status = msg_create(&hmsg_mgr, p_proc_object->dev_obj,
1178 (msg_onexit) node_on_exit); 1176 (msg_onexit) node_on_exit);
1179 DBC_ASSERT(!status);
1180 dev_set_msg_mgr(p_proc_object->dev_obj, hmsg_mgr); 1177 dev_set_msg_mgr(p_proc_object->dev_obj, hmsg_mgr);
1181 } 1178 }
1182 } 1179 }
@@ -1272,7 +1269,6 @@ int proc_load(void *hprocessor, const s32 argc_index,
1272 strlen(pargv0) + 1); 1269 strlen(pargv0) + 1);
1273 else 1270 else
1274 status = -ENOMEM; 1271 status = -ENOMEM;
1275 DBC_ASSERT(brd_state == BRD_LOADED);
1276 } 1272 }
1277 } 1273 }
1278 1274
@@ -1559,7 +1555,6 @@ func_cont:
1559 if (!((*p_proc_object->intf_fxns->brd_status) 1555 if (!((*p_proc_object->intf_fxns->brd_status)
1560 (p_proc_object->bridge_context, &brd_state))) { 1556 (p_proc_object->bridge_context, &brd_state))) {
1561 pr_info("%s: dsp in running state\n", __func__); 1557 pr_info("%s: dsp in running state\n", __func__);
1562 DBC_ASSERT(brd_state != BRD_HIBERNATION);
1563 } 1558 }
1564 } else { 1559 } else {
1565 pr_err("%s: Failed to start the dsp\n", __func__); 1560 pr_err("%s: Failed to start the dsp\n", __func__);
@@ -1585,7 +1580,6 @@ int proc_stop(void *hprocessor)
1585 u32 node_tab_size = 1; 1580 u32 node_tab_size = 1;
1586 u32 num_nodes = 0; 1581 u32 num_nodes = 0;
1587 u32 nodes_allocated = 0; 1582 u32 nodes_allocated = 0;
1588 int brd_state;
1589 1583
1590 if (!p_proc_object) { 1584 if (!p_proc_object) {
1591 status = -EFAULT; 1585 status = -EFAULT;
@@ -1618,11 +1612,6 @@ int proc_stop(void *hprocessor)
1618 msg_delete(hmsg_mgr); 1612 msg_delete(hmsg_mgr);
1619 dev_set_msg_mgr(p_proc_object->dev_obj, NULL); 1613 dev_set_msg_mgr(p_proc_object->dev_obj, NULL);
1620 } 1614 }
1621 if (!((*p_proc_object->
1622 intf_fxns->brd_status) (p_proc_object->
1623 bridge_context,
1624 &brd_state)))
1625 DBC_ASSERT(brd_state == BRD_STOPPED);
1626 } 1615 }
1627 } else { 1616 } else {
1628 pr_err("%s: Failed to stop the processor\n", __func__); 1617 pr_err("%s: Failed to stop the processor\n", __func__);
@@ -1760,7 +1749,6 @@ static int proc_monitor(struct proc_object *proc_obj)
1760{ 1749{
1761 int status = -EPERM; 1750 int status = -EPERM;
1762 struct msg_mgr *hmsg_mgr; 1751 struct msg_mgr *hmsg_mgr;
1763 int brd_state;
1764 1752
1765 /* This is needed only when Device is loaded when it is 1753 /* This is needed only when Device is loaded when it is
1766 * already 'ACTIVE' */ 1754 * already 'ACTIVE' */
@@ -1777,9 +1765,6 @@ static int proc_monitor(struct proc_object *proc_obj)
1777 if (!((*proc_obj->intf_fxns->brd_monitor) 1765 if (!((*proc_obj->intf_fxns->brd_monitor)
1778 (proc_obj->bridge_context))) { 1766 (proc_obj->bridge_context))) {
1779 status = 0; 1767 status = 0;
1780 if (!((*proc_obj->intf_fxns->brd_status)
1781 (proc_obj->bridge_context, &brd_state)))
1782 DBC_ASSERT(brd_state == BRD_IDLE);
1783 } 1768 }
1784 1769
1785 return status; 1770 return status;