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@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
