The dt3155_major variable was never exposed as a parameter so just make it static and always allocate a dynamic major when registering the driver. Also, remove a couple unnecessary comments and printk noise associated with the major/minor numbers and registration. Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> Cc: Scott Smedley <ss@xxxxxxxxxx> --- diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c index 7316996..95f9f0c 100644 --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c @@ -97,14 +97,7 @@ int dt3155_errno = 0; /* wait queue for interrupts */ wait_queue_head_t dt3155_read_wait_queue[MAXBOARDS]; -/* set to dynamicaly allocate, but it is tunable: */ -/* insmod DT_3155 dt3155 dt3155_major=XX */ -int dt3155_major = 0; - -/* The minor numbers are 0 and 1 ... they are not tunable. - * They are used as the indices for the structure vectors, - * and register address vectors - */ +static int dt3155_major; /* Global structures and variables */ @@ -955,16 +948,9 @@ static int __init dt3155_init(void) printk(KERN_INFO "DT3155: Loading module...\n"); /* Register the device driver */ - rcode = register_chrdev(dt3155_major, "dt3155", &dt3155_fops); - if(rcode < 0) - { - printk(KERN_INFO "DT3155: register_chrdev failed \n"); - return rcode; - } - - if(dt3155_major == 0) - dt3155_major = rcode; /* dynamic */ - + dt3155_major = register_chrdev(0, "dt3155", &dt3155_fops); + if (dt3155_major < 0) + return dt3155_major; /* init the status variables. */ /* DMA memory is taken care of in setup_buffers() */ _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel