DSPBRIDGE: Remove unused hDrvObject in bridge_[open|release]

PATCH Superseded Omar Ramirez Luna 2 participants 4 messages Jan 8, 2010

lore

Share & tools

lore

Omar Ramirez Luna

author

2010-01-08 00:51 UTC #0 lore raw

PATCH 4/8 DSPBRIDGE: Remove unused hDrvObject in bridge_[open|release]

This patch removes an unused variable in bridge_open and bridge_release functions, which reduces indentation.

Signed-off-by Omar Ramirez Luna <[email protected]>

---
 drivers/dsp/bridge/rmgr/drv_interface.c |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 deletions(-)

drivers/dsp/bridge/rmgr/drv_interface.c +5 ~~-20~~

index 3a4d058..e551840 100644
@@ -540,18 +540,10 @@ static void __exit bridge_exit(void)
 static int bridge_open(struct inode *ip, struct file *filp)
 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt = NULL;
 
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_open\n");
 
-	dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-	if (DSP_FAILED(dsp_status)) {
-		status = -EIO;
-		goto err;
-	}
-
 	/*
 	 * Allocate a new process context and insert it into global
 	 * process context list.

@@ -564,7 +556,6 @@ static int bridge_open(struct inode *ip, struct file *filp)
 
 	filp->private_data = pr_ctxt;
 
-err:
 	GT_0trace(driverTrace, GT_ENTER, "<- bridge_open\n");
 	return status;
 }

@@ -576,8 +567,6 @@ err:
 static int bridge_release(struct inode *ip, struct file *filp)
 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt;
 
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_release\n");

@@ -588,15 +577,11 @@ static int bridge_release(struct inode *ip, struct file *filp)
 	}
 
 	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);
-		PROC_Detach(pr_ctxt);
-		MEM_Free(pr_ctxt);
-	} else {
-		status = -EIO;
-	}
+	flush_signals(current);
+	DRV_RemoveAllResources(pr_ctxt);
+	PROC_Detach(pr_ctxt);
+	MEM_Free(pr_ctxt);
+
 	filp->private_data = NULL;
 
 err:

Signature · 1 line

1.6.2.4

Nishanth Menon

2010-01-08 02:19 UTC #1 lore raw

Omar Ramirez Luna had written, on 01/07/2010 07:00 PM, the following:

Quoted 14 lines

This patch removes an unused variable in bridge_open and bridge_release functions, which reduces indentation.
Signed-off-by Omar Ramirez Luna <[email protected]>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 deletions(-)
drivers/dsp/bridge/rmgr/drv_interface.c +0 -0
index 3a4d058..e551840 100644
@@ -540,18 +540,10 @@ static void __exit bridge_exit(void)
 static int bridge_open(struct inode *ip, struct file *filp)

drivers/dsp/bridge/rmgr/drv_interface.c static void __exit bridge_exit(void) · line 550

Quoted 10 lines

drivers/dsp/bridge/rmgr/drv_interface.c +0 -4

 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt = NULL;
 
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_open\n");
 
-	dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-	if (DSP_FAILED(dsp_status)) {

is this some sort of verification if the hDrvObject is valid? if so this is not an unused variable rt?

Quoted 25 lines

drivers/dsp/bridge/rmgr/drv_interface.c +0 -7

-		status = -EIO;
-		goto err;
-	}
-
 	/*
 	 * Allocate a new process context and insert it into global
 	 * process context list.

@@ -564,7 +556,6 @@ static int bridge_open(struct inode *ip, struct file *filp)
 
 	filp->private_data = pr_ctxt;
 
-err:
 	GT_0trace(driverTrace, GT_ENTER, "<- bridge_open\n");
 	return status;
 }

@@ -576,8 +567,6 @@ err:
 static int bridge_release(struct inode *ip, struct file *filp)
 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt;
 
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_release\n");

drivers/dsp/bridge/rmgr/drv_interface.c static int bridge_release(struct inode *ip, struct file *filp) · line 592

Quoted 5 lines

drivers/dsp/bridge/rmgr/drv_interface.c +0 -2

@@ -588,15 +577,11 @@ static int bridge_release(struct inode *ip, struct file *filp)
 	}
 
 	pr_ctxt = filp->private_data;
-	dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-	if (DSP_SUCCEEDED(dsp_status)) {

is this some sort of verification if the hDrvObject is valid? if so this is not an unused variable rt?

Quoted 15 lines

drivers/dsp/bridge/rmgr/drv_interface.c +5 -7

-		flush_signals(current);
-		DRV_RemoveAllResources(pr_ctxt);
-		PROC_Detach(pr_ctxt);
-		MEM_Free(pr_ctxt);
-	} else {
-		status = -EIO;
-	}
+	flush_signals(current);
+	DRV_RemoveAllResources(pr_ctxt);
+	PROC_Detach(pr_ctxt);
+	MEM_Free(pr_ctxt);
+
 	filp->private_data = NULL;
 
 err:

Signature · 2 lines

Regards,
Nishanth Menon

Ramirez Luna, Omar

author

2010-01-08 21:29 UTC #2 lore raw

Quoted 23 lines

From: Menon, Nishanth
Omar Ramirez Luna had written, on 01/07/2010 07:00 PM, the following:
Quoted 20 lines
This patch removes an unused variable in bridge_open and bridge_release functions, which reduces indentation.
Signed-off-by Omar Ramirez Luna <[email protected]>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 deletions(-)
drivers/dsp/bridge/rmgr/drv_interface.c +0 -2
index 3a4d058..e551840 100644
@@ -540,18 +540,10 @@ static void __exit bridge_exit(void)
 static int bridge_open(struct inode *ip, struct file *filp)
 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt = NULL;
 

Quoted 6 lines

drivers/dsp/bridge/rmgr/drv_interface.c static void __exit bridge_exit(void) · line 550
Quoted 4 lines
drivers/dsp/bridge/rmgr/drv_interface.c +0 -2
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_open\n");
 
-	dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-	if (DSP_FAILED(dsp_status)) {
is this some sort of verification if the hDrvObject is valid? if so this is not an unused variable rt?

No, this drv object was used for inserting and removing the process context, it doesn't work as validation at least not in this place.

Quoted 28 lines

drivers/dsp/bridge/rmgr/drv_interface.c +0 -7

-		status = -EIO;
-		goto err;
-	}
-
 	/*
 	 * Allocate a new process context and insert it into global
 	 * process context list.

@@ -564,7 +556,6 @@ static int bridge_open(struct inode *ip, struct file *filp)
 
 	filp->private_data = pr_ctxt;
 
-err:
 	GT_0trace(driverTrace, GT_ENTER, "<- bridge_open\n");
 	return status;
 }

@@ -576,8 +567,6 @@ err:
 static int bridge_release(struct inode *ip, struct file *filp)
 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt;
 
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_release\n");

@@ -588,15 +577,11 @@ static int bridge_release(struct inode *ip, struct file *filp)
 	}

Quoted 5 lines

drivers/dsp/bridge/rmgr/drv_interface.c static int bridge_release(struct inode *ip, struct file *filp) · line 592
Quoted 3 lines
drivers/dsp/bridge/rmgr/drv_interface.c +0 -2
 	pr_ctxt = filp->private_data;
-	dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-	if (DSP_SUCCEEDED(dsp_status)) {
is this some sort of verification if the hDrvObject is valid? if so this is not an unused variable rt?

No, this drv object was used for inserting and removing the process context, it doesn't work as validation at least not in this place.

Quoted 14 lines

drivers/dsp/bridge/rmgr/drv_interface.c +5 -7

-		flush_signals(current);
-		DRV_RemoveAllResources(pr_ctxt);
-		PROC_Detach(pr_ctxt);
-		MEM_Free(pr_ctxt);
-	} else {
-		status = -EIO;
-	}
+	flush_signals(current);
+	DRV_RemoveAllResources(pr_ctxt);
+	PROC_Detach(pr_ctxt);
+	MEM_Free(pr_ctxt);
+
 	filp->private_data = NULL;

Quoted 2 lines

drivers/dsp/bridge/rmgr/drv_interface.c static int bridge_release(struct inode *ip, struct file *filp) · line 587
Quoted 1 line
drivers/dsp/bridge/rmgr/drv_interface.c +0 -0
 err:

- omar

Nishanth Menon

Acked-by

2010-01-08 21:38 UTC #3 lore raw

Ramirez Luna, Omar had written, on 01/08/2010 03:29 PM, the following:

Quoted 25 lines

Quoted 25 lines
From: Menon, Nishanth
Omar Ramirez Luna had written, on 01/07/2010 07:00 PM, the following:
Quoted 22 lines
This patch removes an unused variable in bridge_open and bridge_release functions, which reduces indentation.
Signed-off-by Omar Ramirez Luna <[email protected]>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   25 +++++--------------------
 1 files changed, 5 insertions(+), 20 deletions(-)
drivers/dsp/bridge/rmgr/drv_interface.c +0 -2
index 3a4d058..e551840 100644
@@ -540,18 +540,10 @@ static void __exit bridge_exit(void)
 static int bridge_open(struct inode *ip, struct file *filp)
 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt = NULL;
 
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_open\n");
 

Quoted 7 lines

Quoted 4 lines
drivers/dsp/bridge/rmgr/drv_interface.c static void __exit bridge_exit(void) · line 550
Quoted 2 lines
drivers/dsp/bridge/rmgr/drv_interface.c +0 -2
-	dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-	if (DSP_FAILED(dsp_status)) {
is this some sort of verification if the hDrvObject is valid? if so this is not an unused variable rt?
No, this drv object was used for inserting and removing the process context, it doesn't work as validation at least not in this place.

thanks.

Acked-by Nishanth Menon <[email protected]>

Quoted 54 lines

Quoted 28 lines
Quoted 28 lines
drivers/dsp/bridge/rmgr/drv_interface.c +0 -7
-		status = -EIO;
-		goto err;
-	}
-
 	/*
 	 * Allocate a new process context and insert it into global
 	 * process context list.
@@ -564,7 +556,6 @@ static int bridge_open(struct inode *ip, struct file *filp)
 
 	filp->private_data = pr_ctxt;
 
-err:
 	GT_0trace(driverTrace, GT_ENTER, "<- bridge_open\n");
 	return status;
 }
@@ -576,8 +567,6 @@ err:
 static int bridge_release(struct inode *ip, struct file *filp)
 {
 	int status = 0;
-	DSP_STATUS dsp_status;
-	HANDLE hDrvObject;
 	struct PROCESS_CONTEXT *pr_ctxt;
 
 	GT_0trace(driverTrace, GT_ENTER, "-> bridge_release\n");
@@ -588,15 +577,11 @@ static int bridge_release(struct inode *ip, struct file *filp)
 	}
 
Quoted 5 lines
drivers/dsp/bridge/rmgr/drv_interface.c static int bridge_release(struct inode *ip, struct file *filp) · line 592
Quoted 3 lines
drivers/dsp/bridge/rmgr/drv_interface.c +0 -2
 	pr_ctxt = filp->private_data;
-	dsp_status = CFG_GetObject((u32 *)&hDrvObject, REG_DRV_OBJECT);
-	if (DSP_SUCCEEDED(dsp_status)) {
is this some sort of verification if the hDrvObject is valid? if so this is not an unused variable rt?
No, this drv object was used for inserting and removing the process context, it doesn't work as validation at least not in this place.
Quoted 14 lines
Quoted 14 lines
drivers/dsp/bridge/rmgr/drv_interface.c +5 -7
-		flush_signals(current);
-		DRV_RemoveAllResources(pr_ctxt);
-		PROC_Detach(pr_ctxt);
-		MEM_Free(pr_ctxt);
-	} else {
-		status = -EIO;
-	}
+	flush_signals(current);
+	DRV_RemoveAllResources(pr_ctxt);
+	PROC_Detach(pr_ctxt);
+	MEM_Free(pr_ctxt);
+
 	filp->private_data = NULL;
 
Quoted 1 line
drivers/dsp/bridge/rmgr/drv_interface.c static int bridge_release(struct inode *ip, struct file *filp) · line 587
Quoted 1 line
drivers/dsp/bridge/rmgr/drv_interface.c +0 -0
 err:
- omar

Signature · 2 lines

Regards,
Nishanth Menon