drivers: char: Replace "foo * bar" with "foo *bar".
PATCH 1/5 drivers: char: Replace "foo * bar" with "foo *bar".
In reply to a message not in the archiveRemove space after * in pointer type, to follow linux coding style. This patch fixes the following checkpatch issue:
ERROR: "foo * bar" should be "foo *bar"
--- drivers/char/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/misc.c +2 -2
@@ -109,7 +109,7 @@ static const struct file_operations misc_proc_fops = { };#endif -static int misc_open (struct inode * inode,struct file * file) +static int misc_open (struct inode *inode,struct file *file) {int minor =iminor (inode);struct miscdevice *c;
@@ -182,7 +182,7 @@ static const struct file_operations misc_fops = {* failure. */ -int misc_register (struct miscdevice * misc) +int misc_register (struct miscdevice *misc) {dev_t dev;int err =0 ;
Signature · 1 line
2.9.3
PATCH 2/5 drivers: char: Add space after ','.
In reply to a message not in the archiveAdd space which is required after ',' to follow linux coding style. This patch fixes the checkpatch issue.
--- drivers/char/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/char/misc.c +2 -2
@@ -150,7 +150,7 @@ static int misc_open(struct inode *inode, struct file *file) err =0 ;replace_fops (file, new_fops);if (file->f_op->open) - err = file->f_op->open (inode,file); + err = file->f_op->open (inode, file); fail:mutex_unlock (&misc_mtx);return err;
@@ -287,7 +287,7 @@ static int __init misc_init(void) goto fail_remove; err = -EIO ; -if (register_chrdev (MISC_MAJOR ,"misc" ,&misc_fops)) +if (register_chrdev (MISC_MAJOR ,"misc" , &misc_fops)) goto fail_printk; misc_class->devnode = misc_devnode;return 0 ;
Signature · 1 line
2.9.3
PATCH 3/5 drivers: char: Add blank line after declaration.
In reply to a message not in the archiveAdd a blank line after declaration, to fix the checkpatch issue.
--- drivers/char/misc.c | 1 + 1 file changed, 1 insertion(+)
drivers/char/misc.c +1 -0
@@ -194,6 +194,7 @@ int misc_register(struct miscdevice *misc)if (is_dynamic) {int i =find_first_zero_bit (misc_minors,DYNAMIC_MINORS ); +if (i >=DYNAMIC_MINORS ) { err = -EBUSY ; goto out;
Signature · 1 line
2.9.3
PATCH 4/5 drivers: char: Replace printk with pr_err.
In reply to a message not in the archiveReplace printk with pr_err to fix the checkpatch issue.
--- drivers/char/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/char/misc.c +1 -1
@@ -294,7 +294,7 @@ static int __init misc_init(void)return 0 ; fail_printk: -printk ("unable to get major %d for misc devices\n" ,MISC_MAJOR ); +pr_err ("unable to get major %d for misc devices\n" ,MISC_MAJOR );class_destroy (misc_class); fail_remove:if (ret)
Signature · 1 line
2.9.3
PATCH 5/5 drivers: char: Replace bit operation functions with IDA allocator.
In reply to a message not in the archiveReplace bit operation functions with IDA allocator functions. As IDA allocation is simpler.
--- drivers/char/misc.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/char/misc.c +10 -6
@@ -60,7 +60,7 @@ static DEFINE_MUTEX(misc_mtx);* Assigned numbers, used for dynamic minors */ #define DYNAMIC_MINORS 64/* like dynamic majors */ -static DECLARE_BITMAP(misc_minors, DYNAMIC_MINORS); +static DEFINE_IDA (misc_minors_ida);#ifdef CONFIG_PROC_FS static void *misc_seq_start (struct seq_file *seq,loff_t *pos)
@@ -193,14 +193,18 @@ int misc_register(struct miscdevice *misc)mutex_lock (&misc_mtx);if (is_dynamic) { -int i =find_first_zero_bit (misc_minors,DYNAMIC_MINORS ); +int i =ida_simple_get (&misc_minors_ida,0 , +DYNAMIC_MINORS ,GFP_KERNEL );if (i >=DYNAMIC_MINORS ) { err = -EBUSY ; goto out; - } + }else if (i <0 ) { + err = i; + goto out; + }else { misc->minor =DYNAMIC_MINORS - i -1 ; -set_bit (i, misc_minors); + } }else {struct miscdevice *c;
@@ -222,7 +226,7 @@ int misc_register(struct miscdevice *misc)int i =DYNAMIC_MINORS - misc->minor -1 ;if (i <DYNAMIC_MINORS && i >=0 ) -clear_bit (i, misc_minors); +ida_simple_remove (&misc_minors_ida, i); misc->minor =MISC_DYNAMIC_MINOR ; } err =PTR_ERR (misc->this_device);
@@ -258,7 +262,7 @@ void misc_deregister(struct miscdevice *misc)list_del (&misc->list);device_destroy (misc_class,MKDEV (MISC_MAJOR , misc->minor));if (i <DYNAMIC_MINORS && i >=0 ) -clear_bit (i, misc_minors); +ida_simple_remove (&misc_minors_ida, i);mutex_unlock (&misc_mtx); }
Signature · 1 line
2.9.3
Greg Kroah-Hartman
maintainerRe: [PATCH 5/5] drivers: char: Replace bit operation functions with IDA allocator.
Quoted 2 lines · Varsha Rao
Replace bit operation functions with IDA allocator functions. As IDA allocation is simpler.
But why does this matter?
Quoted 28 lines
Signed-off-by Varsha Rao <[email protected]>--- drivers/char/misc.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)drivers/char/misc.c +3
-2@@ -60,7 +60,7 @@ static DEFINE_MUTEX(misc_mtx);* Assigned numbers, used for dynamic minors */ #define DYNAMIC_MINORS 64/* like dynamic majors */ -static DECLARE_BITMAP(misc_minors, DYNAMIC_MINORS); +static DEFINE_IDA (misc_minors_ida);#ifdef CONFIG_PROC_FS static void *misc_seq_start (struct seq_file *seq,loff_t *pos)@@ -193,14 +193,18 @@ int misc_register(struct miscdevice *misc)mutex_lock (&misc_mtx);if (is_dynamic) { -int i =find_first_zero_bit (misc_minors,DYNAMIC_MINORS ); +int i =ida_simple_get (&misc_minors_ida,0 , +DYNAMIC_MINORS ,GFP_KERNEL );if (i >=DYNAMIC_MINORS ) {
drivers/char/misc.c int misc_register(struct miscdevice *misc) · line 207
Quoted 10 lines
drivers/char/misc.c +5
-2err = -EBUSY ; goto out; - } + }else if (i <0 ) { + err = i; + goto out; + }else { misc->minor =DYNAMIC_MINORS - i -1 ; -set_bit (i, misc_minors); + }
Your indentation is now incorrect :(
Quoted 13 lines
drivers/char/misc.c +1
-1}else {struct miscdevice *c;@@ -222,7 +226,7 @@ int misc_register(struct miscdevice *misc)int i =DYNAMIC_MINORS - misc->minor -1 ;if (i <DYNAMIC_MINORS && i >=0 ) -clear_bit (i, misc_minors); +ida_simple_remove (&misc_minors_ida, i); misc->minor =MISC_DYNAMIC_MINOR ; } err =PTR_ERR (misc->this_device);
drivers/char/misc.c void misc_deregister(struct miscdevice *misc) · line 265
Quoted 5 lines
drivers/char/misc.c +1
-1@@ -258,7 +262,7 @@ void misc_deregister(struct miscdevice *misc)list_del (&misc->list);device_destroy (misc_class,MKDEV (MISC_MAJOR , misc->minor));if (i <DYNAMIC_MINORS && i >=0 ) -clear_bit (i, misc_minors); +ida_simple_remove (&misc_minors_ida, i);
As much as I like the ida interface, I don't see why it is required to use it here, you have not provided any justification for this patch at all :(
thanks,
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 4/5] drivers: char: Replace printk with pr_err.
In reply to Varsha RaoQuoted 12 lines · Varsha Rao
Replace printk with
pr_errto fix the checkpatch issue.Signed-off-by Varsha Rao <[email protected]>--- drivers/char/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/char/misc.c +0
-0
drivers/char/misc.c static int __init misc_init(void) · line 297
Quoted 5 lines
drivers/char/misc.c +1
-1@@ -294,7 +294,7 @@ static int __init misc_init(void)return 0 ; fail_printk: -printk ("unable to get major %d for misc devices\n" ,MISC_MAJOR ); +pr_err ("unable to get major %d for misc devices\n" ,MISC_MAJOR );
Is pr_fmt properly set to use this?
thanks,
greg k-h
Re: [PATCH 5/5] drivers: char: Replace bit operation functions with IDA allocator.
In reply to a message not in the archiveQuoted 4 lines
Quoted 2 lines
Replace bit operation functions with IDA allocator functions. As IDA allocation is simpler.
But why does this matter?
Few of the files in this driver is already using ida allocation. For maintaining the uniformity I have used ida allocation.
Files using idr-ida interfacehw_random/virtio-rng.ctpm/tpm-chip.cppdev.ctpm/tpm-interface.ctpm/tpm.h
Quoted 17 lines
Quoted 6 lines
if (is_dynamic) {drivers/char/misc.c +2
-1-int i =find_first_zero_bit (misc_minors,DYNAMIC_MINORS ); +int i =ida_simple_get (&misc_minors_ida,0 , +DYNAMIC_MINORS ,GFP_KERNEL );if (i >=DYNAMIC_MINORS ) {drivers/char/misc.c int misc_register(struct miscdevice *misc) · line 207
Quoted 10 lines
drivers/char/misc.c +5
-2err = -EBUSY ; goto out; - } + }else if (i <0 ) { + err = i; + goto out; + }else { misc->minor =DYNAMIC_MINORS - i -1 ; -set_bit (i, misc_minors); + }
Quoted 1 line
Your indentation is now incorrect :(
I don't know but in the patch it has correct indentation as below.
- set_bit(i, misc_minors);
+ }
} else {
struct miscdevice *c;Quoted 6 lines
Quoted 6 lines
} else { struct miscdevice *c;drivers/char/misc.c +0
-0@@ -222,7 +226,7 @@ int misc_register(struct miscdevice *misc)int i =DYNAMIC_MINORS - misc->minor -1 ;
Quoted 16 lines
drivers/char/misc.c void misc_deregister(struct miscdevice *misc) · line 265
Quoted 12 lines
drivers/char/misc.c +2
-2if (i <DYNAMIC_MINORS && i >=0 ) -clear_bit (i, misc_minors); +ida_simple_remove (&misc_minors_ida, i); misc->minor =MISC_DYNAMIC_MINOR ; } err =PTR_ERR (misc->this_device);@@ -258,7 +262,7 @@ void misc_deregister(struct miscdevice *misc)list_del (&misc->list);device_destroy (misc_class,MKDEV (MISC_MAJOR , misc->minor));if (i <DYNAMIC_MINORS && i >=0 ) -clear_bit (i, misc_minors); +ida_simple_remove (&misc_minors_ida, i);As much as I like the ida interface, I don't see why it is required to use it here, you have not provided any justification for this patch at all :(
Here by the usage of ida interface, allocation will be simpler, faster and more space efficient. Also conversion to it is simple. As I mentioned earlier in this mail also to maintain uniformity of the driver.
Thanks,
Varsha Rao