[PATCH 4/7] DSPBRIDGE: less indentation for bridge_open and bridge_release

[Omar Ramirez Luna]

Use goto statement to remove one indent level from
bridge_open and bridge_release.

Signed-off-by: Omar Ramirez Luna <omar.rami...@ti.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   61 ++++++++++++++++---------------
 1 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c 
b/drivers/dsp/bridge/rmgr/drv_interface.c
index 22e81bd..0452029 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -553,24 +553,25 @@ static int bridge_open(struct inode *ip, struct file 
*filp)
        GT_0trace(driverTrace, GT_ENTER, "-> bridge_open\n");
 
        dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-       if (DSP_SUCCEEDED(dsp_status)) {
-               /*
-                * Allocate a new process context and insert it into global
-                * process context list.
-                */
-               DRV_InsertProcContext(hDrvObject, &pr_ctxt);
-               if (pr_ctxt) {
-                       DRV_ProcUpdatestate(pr_ctxt, PROC_RES_ALLOCATED);
-                       DRV_ProcSetPID(pr_ctxt, current->tgid);
-               } else {
-                       status = -ENOMEM;
-               }
-       } else {
+       if (DSP_FAILED(dsp_status)) {
                status = -EIO;
+               goto err;
        }
 
+       /*
+        * Allocate a new process context and insert it into global
+        * process context list.
+        */
+       DRV_InsertProcContext(hDrvObject, &pr_ctxt);
+       if (pr_ctxt) {
+               DRV_ProcUpdatestate(pr_ctxt, PROC_RES_ALLOCATED);
+               DRV_ProcSetPID(pr_ctxt, current->tgid);
+       } else {
+               status = -ENOMEM;
+       }
        filp->private_data = pr_ctxt;
 
+err:
        GT_0trace(driverTrace, GT_ENTER, "<- bridge_open\n");
        return status;
 }
@@ -591,25 +592,27 @@ static int bridge_release(struct inode *ip, struct file 
*filp)
 
        if (!filp->private_data) {
                status = -EIO;
-       } else {
-               pr_ctxt = filp->private_data;
-               dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-               if (DSP_SUCCEEDED(dsp_status)) {
-                       flush_signals(current);
-                       DRV_RemoveAllResources(pr_ctxt);
-                       list_for_each_entry_safe(proc_obj_ptr, temp,
-                                       &pr_ctxt->processor_list,
-                                       proc_object) {
-                               PROC_Detach(proc_obj_ptr, pr_ctxt);
-                       }
-                       DRV_RemoveProcContext((struct DRV_OBJECT *)hDrvObject,
-                                       pr_ctxt);
-               } else {
-                       status = -EIO;
+               goto err;
+       }
+
+       pr_ctxt = filp->private_data;
+       dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
+       if (DSP_SUCCEEDED(dsp_status)) {
+               flush_signals(current);
+               DRV_RemoveAllResources(pr_ctxt);
+               list_for_each_entry_safe(proc_obj_ptr, temp,
+                               &pr_ctxt->processor_list,
+                               proc_object) {
+                       PROC_Detach(proc_obj_ptr, pr_ctxt);
                }
-               filp->private_data = NULL;
+               DRV_RemoveProcContext((struct DRV_OBJECT *)hDrvObject,
+                               pr_ctxt);
+       } else {
+               status = -EIO;
        }
+       filp->private_data = NULL;
 
+err:
        GT_0trace(driverTrace, GT_ENTER, "<- bridge_release\n");
        return status;
 }
-- 
1.6.2.4

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html