[DSPBRIGDE PATCH 0/6] trivial dsp patches

[DSPBRIGDE PATCH 0/6] trivial dsp patches

[Felipe Balbi]

just a few cleanups here and there.

Felipe Balbi (6):
  dsp: bridge: use ARRAY_SIZE
  dsp: bridge: wcd: else is unnecessary
  dsp: bridge: rename Kbuild to Makefile
  dsp: bridge: always use dynamic major/minor numbers
  dsp: brigde: remove unnecessary memset()
  dsp: bridge: beautify erro path

 drivers/dsp/bridge/{Kbuild => Makefile} |    0
 drivers/dsp/bridge/pmgr/wcd.c           |    8 +++---
 drivers/dsp/bridge/rmgr/drv_interface.c |   46 +++++++++++++-----------------
 3 files changed, 24 insertions(+), 30 deletions(-)
 rename drivers/dsp/bridge/{Kbuild => Makefile} (100%)

[DSPBRIGDE PATCH 1/6] dsp: bridge: use ARRAY_SIZE

[Felipe Balbi]

trivial patch using ARRAY_SIZE.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/pmgr/wcd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c
index 859043d..7434f43 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/wcd.c
@@ -256,7 +256,7 @@ static struct WCD_Cmd WCD_cmdTable[] = {
 inline DSP_STATUS WCD_CallDevIOCtl(u32 cmd, union Trapped_Args *args,
 				    u32 *pResult)
 {
-	if ((cmd < (sizeof(WCD_cmdTable) / sizeof(struct WCD_Cmd)))) {
+	if (cmd < ARRAY_SIZE(WCD_cmdTable)) {
 		/* make the fxn call via the cmd table */
 		*pResult = (*WCD_cmdTable[cmd].fxn) (args);
 		return DSP_SOK;
@@ -307,7 +307,7 @@ bool WCD_Init(void)
 #ifdef DEBUG
 	/* runtime check of Device IOCtl array. */
 	u32 i;
-	for (i = 1; i < (sizeof(WCD_cmdTable) / sizeof(struct WCD_Cmd)); i++)
+	for (i = 1; i < ARRAY_SIZE(WCD_cmdTable); i++)
 		DBC_Assert(WCD_cmdTable[i - 1].dwIndex == i);
 
 #endif
-- 
1.6.3.3.385.g60647

[DSPBRIGDE PATCH 2/6] dsp: bridge: wcd: else is unnecessary

[Felipe Balbi]

The return makes the use of else unnecessary, remove it

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/pmgr/wcd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c
index 7434f43..01c9572 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/wcd.c
@@ -260,9 +260,9 @@ inline DSP_STATUS WCD_CallDevIOCtl(u32 cmd, union Trapped_Args *args,
 		/* make the fxn call via the cmd table */
 		*pResult = (*WCD_cmdTable[cmd].fxn) (args);
 		return DSP_SOK;
-	} else {
-		return DSP_EINVALIDARG;
 	}
+
+	return DSP_EINVALIDARG;
 }
 
 /*
-- 
1.6.3.3.385.g60647

[DSPBRIGDE PATCH 3/6] dsp: bridge: rename Kbuild to Makefile

[Felipe Balbi]

we all use Makefile, let's keep the name.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/{Kbuild => Makefile} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename drivers/dsp/bridge/{Kbuild => Makefile} (100%)

diff --git a/drivers/dsp/bridge/Kbuild b/drivers/dsp/bridge/Makefile
similarity index 100%
rename from drivers/dsp/bridge/Kbuild
rename to drivers/dsp/bridge/Makefile
-- 
1.6.3.3.385.g60647

[DSPBRIGDE PATCH 4/6] dsp: bridge: always use dynamic major/minor numbers

[Felipe Balbi]

there's no reason to initialize that to 0 or use module parameters
if kernel will always get us dynamic numbers.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   25 ++++++-------------------
 1 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index a283cd7..7763346 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -105,8 +105,6 @@
 #define BRIDGE_NAME "C6410"
 /*  ----------------------------------- Globals */
 #define DRIVER_NAME  "DspBridge"
-#define DRIVER_MAJOR 0		/* Linux assigns our Major device number */
-#define DRIVER_MINOR 0		/* Linux assigns our Major device number */
 s32 dsp_debug;
 
 /* This is a test variable used by Bridge to test different sleep states */
@@ -123,8 +121,8 @@ static u32 driverContext;
 #ifdef CONFIG_BRIDGE_DEBUG
 static char *GT_str;
 #endif /* CONFIG_BRIDGE_DEBUG */
-static s32 driver_major = DRIVER_MAJOR;
-static s32 driver_minor = DRIVER_MINOR;
+static s32 driver_major;
+static s32 driver_minor;
 static char *base_img;
 char *iva_img;
 static char *num_procs = "C55=1";
@@ -162,12 +160,6 @@ module_param(dsp_debug, int, 0);
 MODULE_PARM_DESC(dsp_debug, "Wait after loading DSP image. default = false");
 #endif
 
-module_param(driver_major, int, 0);	/* Driver's major number */
-MODULE_PARM_DESC(driver_major, "Major device number, default = 0 (auto)");
-
-module_param(driver_minor, int, 0);	/* Driver's major number */
-MODULE_PARM_DESC(driver_minor, "Minor device number, default = 0 (auto)");
-
 module_param(dsp_test_sleepstate, int, 0);
 MODULE_PARM_DESC(dsp_test_sleepstate, "DSP Sleep state = 0");
 
@@ -327,21 +319,16 @@ static int __init bridge_init(void)
 #endif
 
 	/* use 2.6 device model */
-	if (driver_major) {
-		dev = MKDEV(driver_major, driver_minor);
-		result = register_chrdev_region(dev, 1, driver_name);
-	} else {
-		result = alloc_chrdev_region(&dev, driver_minor, 1,
-					    driver_name);
-		driver_major = MAJOR(dev);
-	}
-
+	result = alloc_chrdev_region(&dev, driver_minor, 1,
+			driver_name);
 	if (result < 0) {
 		GT_1trace(driverTrace, GT_7CLASS, "bridge_init: "
 				"Can't get Major %d \n", driver_major);
 		return result;
 	}
 
+	driver_major = MAJOR(dev);
+
 	bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
 	if (!bridge_device) {
 		result = -ENOMEM;
-- 
1.6.3.3.385.g60647

[DSPBRIGDE PATCH 5/6] dsp: brigde: remove unnecessary memset()

[Felipe Balbi]

bridge_device is static and thus doesn't need
to be zero-initialized.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 7763346..559d14a 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -335,7 +335,6 @@ static int __init bridge_init(void)
 		unregister_chrdev_region(dev, 1);
 		return result;
 	}
-	memset(bridge_device, 0, sizeof(struct bridge_dev));
 	cdev_init(&bridge_device->cdev, &bridge_fops);
 	bridge_device->cdev.owner = THIS_MODULE;
 	bridge_device->cdev.ops = &bridge_fops;
-- 
1.6.3.3.385.g60647

[DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

[Felipe Balbi]

... and get rid of a possible memory leak.

in case of error while adding the chardev, probe()
would not kfree() bridge_device.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 559d14a..c37c5a0 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -324,7 +324,7 @@ static int __init bridge_init(void)
 	if (result < 0) {
 		GT_1trace(driverTrace, GT_7CLASS, "bridge_init: "
 				"Can't get Major %d \n", driver_major);
-		return result;
+		goto err1;
 	}
 
 	driver_major = MAJOR(dev);
@@ -332,19 +332,17 @@ static int __init bridge_init(void)
 	bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
 	if (!bridge_device) {
 		result = -ENOMEM;
-		unregister_chrdev_region(dev, 1);
-		return result;
+		goto err2;
 	}
 	cdev_init(&bridge_device->cdev, &bridge_fops);
 	bridge_device->cdev.owner = THIS_MODULE;
 	bridge_device->cdev.ops = &bridge_fops;
 
 	status = cdev_add(&bridge_device->cdev, dev, 1);
-
 	if (status) {
 		GT_0trace(driverTrace, GT_7CLASS,
 				"Failed to add the bridge device \n");
-		return status;
+		goto err3;
 	}
 
 	/* udev support */
@@ -474,7 +472,17 @@ static int __init bridge_init(void)
 	DBC_Assert(status == 0);
 	DBC_Assert(DSP_SUCCEEDED(initStatus));
 	GT_0trace(driverTrace, GT_ENTER, " <- driver_init\n");
-	return status;
+
+	return 0;
+
+err3:
+	kfree(bridge_device);
+
+err2:
+	unregister_chrdev_region(dev, 1);
+
+err1:
+	return result;
 }
 
 /*  This function is invoked during unlinking of the bridge module from the
-- 
1.6.3.3.385.g60647

Re: [DSPBRIGDE PATCH 5/6] dsp: brigde: remove unnecessary memset()

[Felipe Balbi]

Hi,

On Fri, Aug 21, 2009 at 12:23:38PM +0200, Balbi Felipe (Nokia-D/Helsinki) wrote:
> bridge_device is static and thus doesn't need
> to be zero-initialized.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

I changed this patch to the following:

==== cut here =====


>From 1a5699476007fdff6beb5a895c74bc15f0bdd223 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Fri, 21 Aug 2009 12:10:00 +0300
Subject: [DSPBRIGDE PATCH 5/6] dsp: brigde: convert kmalloc() memset() to kzalloc()

use kzalloc() instead of manually kmalloc() + memset() later.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 7763346..27e293b 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -329,13 +329,12 @@ static int __init bridge_init(void)
 
 	driver_major = MAJOR(dev);
 
-	bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
+	bridge_device = kzalloc(sizeof(struct bridge_dev), GFP_KERNEL);
 	if (!bridge_device) {
 		result = -ENOMEM;
 		unregister_chrdev_region(dev, 1);
 		return result;
 	}
-	memset(bridge_device, 0, sizeof(struct bridge_dev));
 	cdev_init(&bridge_device->cdev, &bridge_fops);
 	bridge_device->cdev.owner = THIS_MODULE;
 	bridge_device->cdev.ops = &bridge_fops;
-- 
1.6.3.3.385.g60647



-- 
balbi

RE: [DSPBRIGDE PATCH 5/6] dsp: brigde: remove unnecessary memset()

[Guzman Lugo, Fernando]

Acked-by: Fernando Guzman Lugo <x0095840@ti.com>

Regards
-----Original Message-----
From: linux-omap-owner@vger.kernel.org [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Felipe Balbi
Sent: Friday, August 21, 2009 5:30 AM
To: Balbi Felipe (Nokia-D/Helsinki)
Cc: Doyu Hiroshi (Nokia-D/Helsinki); Palande Ameya (Nokia-D/Helsinki); Guzman Lugo, Fernando; Linux OMAP Mailing List
Subject: Re: [DSPBRIGDE PATCH 5/6] dsp: brigde: remove unnecessary memset()

Hi,

On Fri, Aug 21, 2009 at 12:23:38PM +0200, Balbi Felipe (Nokia-D/Helsinki) wrote:
> bridge_device is static and thus doesn't need
> to be zero-initialized.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

I changed this patch to the following:

==== cut here =====


>From 1a5699476007fdff6beb5a895c74bc15f0bdd223 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Fri, 21 Aug 2009 12:10:00 +0300
Subject: [DSPBRIGDE PATCH 5/6] dsp: brigde: convert kmalloc() memset() to kzalloc()

use kzalloc() instead of manually kmalloc() + memset() later.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 7763346..27e293b 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -329,13 +329,12 @@ static int __init bridge_init(void)
 
 	driver_major = MAJOR(dev);
 
-	bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
+	bridge_device = kzalloc(sizeof(struct bridge_dev), GFP_KERNEL);
 	if (!bridge_device) {
 		result = -ENOMEM;
 		unregister_chrdev_region(dev, 1);
 		return result;
 	}
-	memset(bridge_device, 0, sizeof(struct bridge_dev));
 	cdev_init(&bridge_device->cdev, &bridge_fops);
 	bridge_device->cdev.owner = THIS_MODULE;
 	bridge_device->cdev.ops = &bridge_fops;
-- 
1.6.3.3.385.g60647



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

RE: [DSPBRIGDE PATCH 1/6] dsp: bridge: use ARRAY_SIZE

[Guzman Lugo, Fernando]

Acked-by: Fernando Guzman Lugo <x0095840@ti.com>


-----Original Message-----
From: Felipe Balbi [mailto:felipe.balbi@nokia.com] 
Sent: Friday, August 21, 2009 5:24 AM
To: Hiroshi DOYU
Cc: Ameya Palande; Guzman Lugo, Fernando; Linux OMAP Mailing List; Felipe Balbi
Subject: [DSPBRIGDE PATCH 1/6] dsp: bridge: use ARRAY_SIZE

trivial patch using ARRAY_SIZE.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/pmgr/wcd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c
index 859043d..7434f43 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/wcd.c
@@ -256,7 +256,7 @@ static struct WCD_Cmd WCD_cmdTable[] = {
 inline DSP_STATUS WCD_CallDevIOCtl(u32 cmd, union Trapped_Args *args,
 				    u32 *pResult)
 {
-	if ((cmd < (sizeof(WCD_cmdTable) / sizeof(struct WCD_Cmd)))) {
+	if (cmd < ARRAY_SIZE(WCD_cmdTable)) {
 		/* make the fxn call via the cmd table */
 		*pResult = (*WCD_cmdTable[cmd].fxn) (args);
 		return DSP_SOK;
@@ -307,7 +307,7 @@ bool WCD_Init(void)
 #ifdef DEBUG
 	/* runtime check of Device IOCtl array. */
 	u32 i;
-	for (i = 1; i < (sizeof(WCD_cmdTable) / sizeof(struct WCD_Cmd)); i++)
+	for (i = 1; i < ARRAY_SIZE(WCD_cmdTable); i++)
 		DBC_Assert(WCD_cmdTable[i - 1].dwIndex == i);
 
 #endif
-- 
1.6.3.3.385.g60647

RE: [DSPBRIGDE PATCH 2/6] dsp: bridge: wcd: else is unnecessary

[Guzman Lugo, Fernando]

Acked-by: Fernando Guzman Lugo <x0095840@ti.com>

-----Original Message-----
From: Felipe Balbi [mailto:felipe.balbi@nokia.com] 
Sent: Friday, August 21, 2009 5:24 AM
To: Hiroshi DOYU
Cc: Ameya Palande; Guzman Lugo, Fernando; Linux OMAP Mailing List; Felipe Balbi
Subject: [DSPBRIGDE PATCH 2/6] dsp: bridge: wcd: else is unnecessary

The return makes the use of else unnecessary, remove it

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/pmgr/wcd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/bridge/pmgr/wcd.c b/drivers/dsp/bridge/pmgr/wcd.c
index 7434f43..01c9572 100644
--- a/drivers/dsp/bridge/pmgr/wcd.c
+++ b/drivers/dsp/bridge/pmgr/wcd.c
@@ -260,9 +260,9 @@ inline DSP_STATUS WCD_CallDevIOCtl(u32 cmd, union Trapped_Args *args,
 		/* make the fxn call via the cmd table */
 		*pResult = (*WCD_cmdTable[cmd].fxn) (args);
 		return DSP_SOK;
-	} else {
-		return DSP_EINVALIDARG;
 	}
+
+	return DSP_EINVALIDARG;
 }
 
 /*
-- 
1.6.3.3.385.g60647

RE: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

[Guzman Lugo, Fernando]

Acked-by: Fernando Guzman Lugo <x0095840@ti.com>


-----Original Message-----
From: Felipe Balbi [mailto:felipe.balbi@nokia.com] 
Sent: Friday, August 21, 2009 5:24 AM
To: Hiroshi DOYU
Cc: Ameya Palande; Guzman Lugo, Fernando; Linux OMAP Mailing List; Felipe Balbi
Subject: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

... and get rid of a possible memory leak.

in case of error while adding the chardev, probe()
would not kfree() bridge_device.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index 559d14a..c37c5a0 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -324,7 +324,7 @@ static int __init bridge_init(void)
 	if (result < 0) {
 		GT_1trace(driverTrace, GT_7CLASS, "bridge_init: "
 				"Can't get Major %d \n", driver_major);
-		return result;
+		goto err1;
 	}
 
 	driver_major = MAJOR(dev);
@@ -332,19 +332,17 @@ static int __init bridge_init(void)
 	bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
 	if (!bridge_device) {
 		result = -ENOMEM;
-		unregister_chrdev_region(dev, 1);
-		return result;
+		goto err2;
 	}
 	cdev_init(&bridge_device->cdev, &bridge_fops);
 	bridge_device->cdev.owner = THIS_MODULE;
 	bridge_device->cdev.ops = &bridge_fops;
 
 	status = cdev_add(&bridge_device->cdev, dev, 1);
-
 	if (status) {
 		GT_0trace(driverTrace, GT_7CLASS,
 				"Failed to add the bridge device \n");
-		return status;
+		goto err3;
 	}
 
 	/* udev support */
@@ -474,7 +472,17 @@ static int __init bridge_init(void)
 	DBC_Assert(status == 0);
 	DBC_Assert(DSP_SUCCEEDED(initStatus));
 	GT_0trace(driverTrace, GT_ENTER, " <- driver_init\n");
-	return status;
+
+	return 0;
+
+err3:
+	kfree(bridge_device);
+
+err2:
+	unregister_chrdev_region(dev, 1);
+
+err1:
+	return result;
 }
 
 /*  This function is invoked during unlinking of the bridge module from the
-- 
1.6.3.3.385.g60647

RE: [DSPBRIGDE PATCH 4/6] dsp: bridge: always use dynamic major/minor numbers

[Guzman Lugo, Fernando]

Acked-by: Fernando Guzman Lugo <x0095840@ti.com>


-----Original Message-----
From: Felipe Balbi [mailto:felipe.balbi@nokia.com] 
Sent: Friday, August 21, 2009 5:24 AM
To: Hiroshi DOYU
Cc: Ameya Palande; Guzman Lugo, Fernando; Linux OMAP Mailing List; Felipe Balbi
Subject: [DSPBRIGDE PATCH 4/6] dsp: bridge: always use dynamic major/minor numbers

there's no reason to initialize that to 0 or use module parameters
if kernel will always get us dynamic numbers.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 drivers/dsp/bridge/rmgr/drv_interface.c |   25 ++++++-------------------
 1 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index a283cd7..7763346 100755
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -105,8 +105,6 @@
 #define BRIDGE_NAME "C6410"
 /*  ----------------------------------- Globals */
 #define DRIVER_NAME  "DspBridge"
-#define DRIVER_MAJOR 0		/* Linux assigns our Major device number */
-#define DRIVER_MINOR 0		/* Linux assigns our Major device number */
 s32 dsp_debug;
 
 /* This is a test variable used by Bridge to test different sleep states */
@@ -123,8 +121,8 @@ static u32 driverContext;
 #ifdef CONFIG_BRIDGE_DEBUG
 static char *GT_str;
 #endif /* CONFIG_BRIDGE_DEBUG */
-static s32 driver_major = DRIVER_MAJOR;
-static s32 driver_minor = DRIVER_MINOR;
+static s32 driver_major;
+static s32 driver_minor;
 static char *base_img;
 char *iva_img;
 static char *num_procs = "C55=1";
@@ -162,12 +160,6 @@ module_param(dsp_debug, int, 0);
 MODULE_PARM_DESC(dsp_debug, "Wait after loading DSP image. default = false");
 #endif
 
-module_param(driver_major, int, 0);	/* Driver's major number */
-MODULE_PARM_DESC(driver_major, "Major device number, default = 0 (auto)");
-
-module_param(driver_minor, int, 0);	/* Driver's major number */
-MODULE_PARM_DESC(driver_minor, "Minor device number, default = 0 (auto)");
-
 module_param(dsp_test_sleepstate, int, 0);
 MODULE_PARM_DESC(dsp_test_sleepstate, "DSP Sleep state = 0");
 
@@ -327,21 +319,16 @@ static int __init bridge_init(void)
 #endif
 
 	/* use 2.6 device model */
-	if (driver_major) {
-		dev = MKDEV(driver_major, driver_minor);
-		result = register_chrdev_region(dev, 1, driver_name);
-	} else {
-		result = alloc_chrdev_region(&dev, driver_minor, 1,
-					    driver_name);
-		driver_major = MAJOR(dev);
-	}
-
+	result = alloc_chrdev_region(&dev, driver_minor, 1,
+			driver_name);
 	if (result < 0) {
 		GT_1trace(driverTrace, GT_7CLASS, "bridge_init: "
 				"Can't get Major %d \n", driver_major);
 		return result;
 	}
 
+	driver_major = MAJOR(dev);
+
 	bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
 	if (!bridge_device) {
 		result = -ENOMEM;
-- 
1.6.3.3.385.g60647

Re: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

[Andy Shevchenko]

On Fri, Aug 28, 2009 at 11:58 PM, Guzman Lugo,


> @@ -324,7 +324,7 @@ static int __init bridge_init(void)
>        if (result < 0) {
>                GT_1trace(driverTrace, GT_7CLASS, "bridge_init: "
>                                "Can't get Major %d \n", driver_major);
> -               return result;
> +               goto err1;
>        }
>
>        driver_major = MAJOR(dev);
> @@ -332,19 +332,17 @@ static int __init bridge_init(void)
>        bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
>        if (!bridge_device) {
>                result = -ENOMEM;
> -               unregister_chrdev_region(dev, 1);
> -               return result;
> +               goto err2;
>        }
>        cdev_init(&bridge_device->cdev, &bridge_fops);
>        bridge_device->cdev.owner = THIS_MODULE;
>        bridge_device->cdev.ops = &bridge_fops;
>
>        status = cdev_add(&bridge_device->cdev, dev, 1);
> -
>        if (status) {
>                GT_0trace(driverTrace, GT_7CLASS,
>                                "Failed to add the bridge device \n");
> -               return status;
result = status, isn't is?
or change status to result on previous lines.


> +               goto err3;
>        }
>
>        /* udev support */
> @@ -474,7 +472,17 @@ static int __init bridge_init(void)
>        DBC_Assert(status == 0);
>        DBC_Assert(DSP_SUCCEEDED(initStatus));
>        GT_0trace(driverTrace, GT_ENTER, " <- driver_init\n");
> -       return status;
> +
> +       return 0;
> +
> +err3:
> +       kfree(bridge_device);
> +
> +err2:
> +       unregister_chrdev_region(dev, 1);
> +
> +err1:
> +       return result;
>  }
>
>  /*  This function is invoked during unlinking of the bridge module from the


-- 
With Best Regards,
Andy Shevchenko

RE: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

[Guzman Lugo, Fernando]

Hi,

>-----Original Message-----
>From: Andy Shevchenko [mailto:andy.shevchenko@gmail.com]
>Sent: Friday, August 28, 2009 4:13 PM
>To: Guzman Lugo, Fernando
>Cc: Felipe Balbi; Hiroshi DOYU; Ameya Palande; Linux OMAP Mailing List
>Subject: Re: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path
>
>On Fri, Aug 28, 2009 at 11:58 PM, Guzman Lugo,
>
>
>> @@ -324,7 +324,7 @@ static int __init bridge_init(void)
>>        if (result < 0) {
>>                GT_1trace(driverTrace, GT_7CLASS, "bridge_init: "
>>                                "Can't get Major %d \n", driver_major);
>> -               return result;
>> +               goto err1;
>>        }
>>
>>        driver_major = MAJOR(dev);
>> @@ -332,19 +332,17 @@ static int __init bridge_init(void)
>>        bridge_device = kmalloc(sizeof(struct bridge_dev), GFP_KERNEL);
>>        if (!bridge_device) {
>>                result = -ENOMEM;
>> -               unregister_chrdev_region(dev, 1);
>> -               return result;
>> +               goto err2;
>>        }
>>        cdev_init(&bridge_device->cdev, &bridge_fops);
>>        bridge_device->cdev.owner = THIS_MODULE;
>>        bridge_device->cdev.ops = &bridge_fops;
>>
>>        status = cdev_add(&bridge_device->cdev, dev, 1);
>> -
>>        if (status) {
>>                GT_0trace(driverTrace, GT_7CLASS,
>>                                "Failed to add the bridge device \n");
>> -               return status;
>result = status, isn't is?
>or change status to result on previous lines.
>

Yes, we need to assigned status to result, in order to report the error, however I think we can get rid of result and use status instead, what do you think?

>
>> +               goto err3;
>>        }
>>
>>        /* udev support */
>> @@ -474,7 +472,17 @@ static int __init bridge_init(void)
>>        DBC_Assert(status == 0);
>>        DBC_Assert(DSP_SUCCEEDED(initStatus));
>>        GT_0trace(driverTrace, GT_ENTER, " <- driver_init\n");
>> -       return status;
>> +
>> +       return 0;
>> +
>> +err3:
>> +       kfree(bridge_device);
>> +
>> +err2:
>> +       unregister_chrdev_region(dev, 1);
>> +
>> +err1:
>> +       return result;
>>  }
>>
>>  /*  This function is invoked during unlinking of the bridge module from
>the
>
>
>--
>With Best Regards,
>Andy Shevchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

[Andy Shevchenko]

On Sat, Aug 29, 2009 at 1:31 AM, Guzman Lugo, Fernando<x0095840@ti.com> wrote:

>>result = status, isn't is?
>>or change status to result on previous lines.
> Yes, we need to assigned status to result, in order to report the error, however I think we can get rid of result and use status instead, what do you think?

As far as I see this is not the dsp status but just a word to collect
errors. More logical in this piece of your code is to use result word
instead of status.

-- 
With Best Regards,
Andy Shevchenko

RE: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

[Guzman Lugo, Fernando]

Hi,

>-----Original Message-----
>From: Andy Shevchenko [mailto:andy.shevchenko@gmail.com]
>Sent: Saturday, August 29, 2009 2:19 AM
>To: Guzman Lugo, Fernando
>Cc: Felipe Balbi; Hiroshi DOYU; Ameya Palande; Linux OMAP Mailing List
>Subject: Re: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path
>
>On Sat, Aug 29, 2009 at 1:31 AM, Guzman Lugo, Fernando<x0095840@ti.com>
>wrote:
>
>>>result = status, isn't is?
>>>or change status to result on previous lines.
>> Yes, we need to assigned status to result, in order to report the error,
>however I think we can get rid of result and use status instead, what do
>you think?
>
>As far as I see this is not the dsp status but just a word to collect
>errors. More logical in this piece of your code is to use result word
>instead of status.

Maybe you did not see far enough, but variable initStatus it the one use to store DSPBridge errors, the variable status is use to collect the status from calls to kernel functions. So I think we don't need two variables to collect error from kernel, so we should use one, it could be status or results it does not matters. What do you think?

Regards,
Fernando.

>
>--
>With Best Regards,
>Andy Shevchenko

RE: [DSPBRIGDE PATCH 3/6] dsp: bridge: rename Kbuild to Makefile

[Guzman Lugo, Fernando]

Acked-by: Fernando Guzman Lugo <x0095840@ti.com>


>-----Original Message-----
>From: Felipe Balbi [mailto:felipe.balbi@nokia.com]
>Sent: Friday, August 21, 2009 5:24 AM
>To: Hiroshi DOYU
>Cc: Ameya Palande; Guzman Lugo, Fernando; Linux OMAP Mailing List; Felipe
>Balbi
>Subject: [DSPBRIGDE PATCH 3/6] dsp: bridge: rename Kbuild to Makefile
>
>we all use Makefile, let's keep the name.
>
>Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
>---
> drivers/dsp/bridge/{Kbuild => Makefile} |    0
> 1 files changed, 0 insertions(+), 0 deletions(-)
> rename drivers/dsp/bridge/{Kbuild => Makefile} (100%)
>
>diff --git a/drivers/dsp/bridge/Kbuild b/drivers/dsp/bridge/Makefile
>similarity index 100%
>rename from drivers/dsp/bridge/Kbuild
>rename to drivers/dsp/bridge/Makefile
>--
>1.6.3.3.385.g60647
>

Re: [DSPBRIGDE PATCH 6/6] dsp: bridge: beautify erro path

[Felipe Balbi]

Hi,

On Mon, Aug 31, 2009 at 09:50:30PM +0200, ext Guzman Lugo, Fernando wrote:
> >As far as I see this is not the dsp status but just a word to collect
> >errors. More logical in this piece of your code is to use result word
> >instead of status.
> 
> Maybe you did not see far enough, but variable initStatus it the one use to
> store DSPBridge errors, the variable status is use to collect the status
> from calls to kernel functions. So I think we don't need two variables to
> collect error from kernel, so we should use one, it could be status or
> results it does not matters. What do you think?

yes, this has to be cleaned up, but it should be an extra patch and not
in this one.

-- 
balbi