staging/vme: fix checkpatch warnings
PATCH 1/1 staging/vme: fix checkpatch warnings
Now checkpatch clean.
$ find drivers/staging/vme -name "*.[ch]"|xargs ./scripts/checkpatch.pl \
-f --terse --nosummary|cut -f3- -d":"|sort |uniq -c|sort -n
1 ERROR: trailing whitespace
2 WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
5 WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
7 WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
9 WARNING: quoted string split across lines
13 WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ...--- drivers/staging/vme/devices/vme_pio2_core.c | 9 ++-- drivers/staging/vme/devices/vme_user.c | 70 ++++++++++++--------------- 2 files changed, 35 insertions(+), 44 deletions(-)
drivers/staging/vme/devices/vme_pio2_core.c +4 -5
@@ -163,15 +163,14 @@ static int __init pio2_init(void)int retval =0 ;if (bus_num ==0 ) { -printk (KERN_ERR "%s: No cards, skipping registration\n" , - driver_name); +pr_err ("%s: No cards, skipping registration\n" , + driver_name); goto err_nocard; }if (bus_num >PIO2_CARDS_MAX ) { -printk (KERN_ERR -"%s: Driver only able to handle %d PIO2 Cards\n" , - driver_name,PIO2_CARDS_MAX ); +pr_err ("%s: Driver only able to handle %d PIO2 Cards\n" , + driver_name,PIO2_CARDS_MAX ); bus_num =PIO2_CARDS_MAX ; }
drivers/staging/vme/devices/vme_user.c +31 -39
220 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH 1/1 staging/vme: fix checkpatch warnings
Now checkpatch clean.
$ find drivers/staging/vme -name "*.[ch]"|xargs ./scripts/checkpatch.pl \
-f --terse --nosummary|cut -f3- -d":"|sort |uniq -c|sort -n
1 ERROR: trailing whitespace
2 WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
5 WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
7 WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
9 WARNING: quoted string split across lines
13 WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ...--- drivers/staging/vme/devices/vme_pio2_core.c | 10 ++-- drivers/staging/vme/devices/vme_user.c | 71 ++++++++++++--------------- 2 files changed, 36 insertions(+), 45 deletions(-)
drivers/staging/vme/devices/vme_pio2_core.c +5 -5
@@ -10,6 +10,8 @@* option) any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h>
@@ -163,15 +165,13 @@ static int __init pio2_init(void)int retval =0 ;if (bus_num ==0 ) { -printk (KERN_ERR "%s: No cards, skipping registration\n" , - driver_name); +pr_err ("No cards, skipping registration\n" ); goto err_nocard; }if (bus_num >PIO2_CARDS_MAX ) { -printk (KERN_ERR -"%s: Driver only able to handle %d PIO2 Cards\n" , - driver_name,PIO2_CARDS_MAX ); +pr_err ("Driver only able to handle %d PIO2 Cards\n" , +PIO2_CARDS_MAX ); bus_num =PIO2_CARDS_MAX ; }
drivers/staging/vme/devices/vme_user.c +31 -40
227 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH 1/5 staging/vme: fix checkpatch error
In reply to Toshiaki YamaneThe below checkpatch error was fixed.
-ERROR: trailing whitespace
--- drivers/staging/vme/devices/vme_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vme/devices/vme_user.c +1 -1
@@ -396,7 +396,7 @@ static ssize_t vme_user_write(struct file *file, const char __user *buf,default : retval = -EINVAL ; } - +mutex_unlock (&image[minor].mutex);if (retval >0 )
Signature · 1 line
1.7.9.5
PATCH 2/5 staging/vme: fix checkpatch warning
The below checkpatch warnings was fixed,
-WARNING: Prefer pr_info(... to printk(KERN_INFO, ...
and added pr_fmt.
--- drivers/staging/vme/devices/vme_user.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/staging/vme/devices/vme_user.c +7 -6
@@ -15,6 +15,8 @@* option) any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/cdev.h> #include <linux/delay.h> #include <linux/device.h>
@@ -225,13 +227,13 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count, (unsigned long)copied);if (retval !=0 ) { copied = (copied - retval); -printk (KERN_INFO "User copy failed\n" ); +pr_info ("User copy failed\n" );return -EINVAL ; } }else {/* XXX Need to write this */ -printk (KERN_INFO "Currently don't support large transfers\n" ); +pr_info ("Currently don't support large transfers\n" );/* Map in pages from userspace */ /* Call vme_master_read to do the transfer */
@@ -265,7 +267,7 @@ static ssize_t resource_from_user(unsigned int minor, const char __user *buf, image[minor].kern_buf, copied, *ppos); }else {/* XXX Need to write this */ -printk (KERN_INFO "Currently don't support large transfers\n" ); +pr_info ("Currently don't support large transfers\n" );/* Map in pages from userspace */ /* Call vme_master_write to do the transfer */
@@ -629,7 +631,7 @@ static int __init vme_user_init(void) {int retval =0 ; -printk (KERN_INFO "VME User Space Access Driver\n" ); +pr_info ("VME User Space Access Driver\n" );if (bus_num ==0 ) { printk(KERN_ERR "%s: No cards, skipping registration\n",
@@ -803,8 +805,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].device =device_create (vme_user_sysfs_class,NULL ,MKDEV (VME_MAJOR , i),NULL , name, num);if (IS_ERR (image[i].device)) { -printk (KERN_INFO "%s: Error creating sysfs device\n" , - driver_name); +pr_info ("Error creating sysfs device\n" ); err =PTR_ERR (image[i].device); goto err_sysfs; }
Signature · 1 line
1.7.9.5
Re: [PATCH 2/5] staging/vme: fix checkpatch warning
You've got the same subject repeated 5 times.
It would be better to merge all the vme_user.c printk fixes into one patch.
[patch 1/3] Staging: vme: Fix a white space issue [patch 2/3] Staging: vme: Use pr_ printks in vme_user.c [patch 3/3] Staging: vme: Use pr_ printks in vme_pio2_core.c
It's not a huge deal, it just seems like there was some confusion on how to break patches up.
regards,
dan carpenter
Re: [PATCH 2/5] staging/vme: fix checkpatch warning
Quoted 10 lines · Dan Carpenter
You've got the same subject repeated 5 times.
It would be better to merge all the
vme_user.cprintk fixes into one patch.
[patch 1/3] Staging: vme: Fix a white space issue [patch 2/3] Staging: vme: Usepr_printks invme_user.c[patch 3/3] Staging: vme: Usepr_printks invme_pio2_core.cIt's not a huge deal, it just seems like there was some confusion on how to break patches up.
Thanks for your reply!
I will try to fix it.
Signature · 10 lines
Regards, . . ... Yamane Toshiaki [email protected]
Greg Kroah-Hartman
maintainerRe: [PATCH 2/5] staging/vme: fix checkpatch warning
Quoted 9 lines · Toshiaki Yamane
Quoted 8 lines · Dan Carpenter
You've got the same subject repeated 5 times.
It would be better to merge all the
vme_user.cprintk fixes into one patch.
[patch 1/3] Staging: vme: Fix a white space issue [patch 2/3] Staging: vme: Usepr_printks invme_user.c[patch 3/3] Staging: vme: Usepr_printks invme_pio2_core.c
Quoted 6 lines
Quoted 2 lines
It's not a huge deal, it just seems like there was some confusion on how to break patches up.
Thanks for your reply!
I will try to fix it.
Please do, I can't take it as-is.
greg k-h
Re: [PATCH 2/5] staging/vme: fix checkpatch warning
Quoted 10 lines · Greg Kroah-Hartman
Quoted 9 lines · Toshiaki Yamane
Quoted 8 lines · Dan Carpenter
You've got the same subject repeated 5 times.
It would be better to merge all the
vme_user.cprintk fixes into one patch.
[patch 1/3] Staging: vme: Fix a white space issue [patch 2/3] Staging: vme: Usepr_printks invme_user.c[patch 3/3] Staging: vme: Usepr_printks invme_pio2_core.c
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
It's not a huge deal, it just seems like there was some confusion on how to break patches up.
Thanks for your reply!
I will try to fix it.Please do, I can't take it as-is.
I will stop, if you say so.
Re: [PATCH 2/5] staging/vme: fix checkpatch warning
Quoted 16 lines · Toshiaki Yamane
Quoted 14 lines · Greg Kroah-Hartman
Quoted 13 lines · Toshiaki Yamane
Quoted 10 lines · Dan Carpenter
You've got the same subject repeated 5 times.
It would be better to merge all the
vme_user.cprintk fixes into one patch.
[patch 1/3] Staging: vme: Fix a white space issue [patch 2/3] Staging: vme: Usepr_printks invme_user.c[patch 3/3] Staging: vme: Usepr_printks invme_pio2_core.cIt's not a huge deal, it just seems like there was some confusion on how to break patches up.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Thanks for your reply!
I will try to fix it.Please do, I can't take it as-is.
I will stop, if you say so.
Greg-san,
I have misunderstood your reply. I am sorry...
I will send a patch from now.
Signature · 10 lines
Regards, . . ... Yamane Toshiaki [email protected]
PATCH 1/3 Staging: vme: Fix a white space issue
In reply to Dan CarpenterThe below checkpatch error was fixed.
-ERROR: trailing whitespace
--- drivers/staging/vme/devices/vme_user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/vme/devices/vme_user.c +1 -1
@@ -396,7 +396,7 @@ static ssize_t vme_user_write(struct file *file, const char __user *buf,default : retval = -EINVAL ; } - +mutex_unlock (&image[minor].mutex);if (retval >0 )
Signature · 1 line
1.7.9.5
PATCH 2/3 staging/vme: Use pr_ printks in vme_user.c
In reply to Dan CarpenterThe below checkpatch warnings was fixed,
-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
and added pr_fmt.
--- drivers/staging/vme/devices/vme_user.c | 69 ++++++++++++++------------------ 1 file changed, 30 insertions(+), 39 deletions(-)
drivers/staging/vme/devices/vme_user.c +30 -39
@@ -15,6 +15,8 @@* option) any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/cdev.h> #include <linux/delay.h> #include <linux/device.h>
@@ -170,7 +172,7 @@ static int vme_user_open(struct inode *inode, struct file *file)mutex_lock (&image[minor].mutex);/* Allow device to be opened if a resource is needed and allocated. */ if (minor <CONTROL_MINOR && image[minor].resource ==NULL ) { -printk (KERN_ERR "No resources allocated for device\n" ); +pr_err ("No resources allocated for device\n" ); err = -EINVAL ; goto err_res; }
@@ -225,13 +227,13 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count, (unsigned long)copied);if (retval !=0 ) { copied = (copied - retval); -printk (KERN_INFO "User copy failed\n" ); +pr_info ("User copy failed\n" );return -EINVAL ; } }else {/* XXX Need to write this */ -printk (KERN_INFO "Currently don't support large transfers\n" ); +pr_info ("Currently don't support large transfers\n" );/* Map in pages from userspace */ /* Call vme_master_read to do the transfer */
@@ -265,7 +267,7 @@ static ssize_t resource_from_user(unsigned int minor, const char __user *buf, image[minor].kern_buf, copied, *ppos); }else {/* XXX Need to write this */ -printk (KERN_INFO "Currently don't support large transfers\n" ); +pr_info ("Currently don't support large transfers\n" );/* Map in pages from userspace */ /* Call vme_master_write to do the transfer */
@@ -286,7 +288,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf, retval =__copy_to_user (buf, image_ptr, (unsigned long )count);if (retval !=0 ) { retval = (count - retval); -printk (KERN_WARNING "Partial copy to userspace\n" ); +pr_warn ("Partial copy to userspace\n" ); }else retval = count;
@@ -305,7 +307,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char __user *buf, retval =__copy_from_user (image_ptr, buf, (unsigned long )count);if (retval !=0 ) { retval = (count - retval); -printk (KERN_WARNING "Partial copy to userspace\n" ); +pr_warn ("Partial copy to userspace\n" ); }else retval = count;
@@ -476,7 +478,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&irq_req, argp,sizeof (struct vme_irq_id ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from userspace\n" ); +pr_warn ("Partial copy from userspace\n" );return -EFAULT ; }
@@ -503,8 +505,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_to_user (argp, &master,sizeof (struct vme_master ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy to " -"userspace\n" ); +pr_warn ("Partial copy to userspace\n" );return -EFAULT ; }
@@ -515,8 +516,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&master, argp,sizeof (master));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from " -"userspace\n" ); +pr_warn ("Partial copy from userspace\n" );return -EFAULT ; }
@@ -546,8 +546,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_to_user (argp, &slave,sizeof (struct vme_slave ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy to " -"userspace\n" ); +pr_warn ("Partial copy to userspace\n" );return -EFAULT ; }
@@ -558,8 +557,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&slave, argp,sizeof (slave));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from " -"userspace\n" ); +pr_warn ("Partial copy from userspace\n" );return -EFAULT ; }
@@ -599,8 +597,8 @@ static void buf_unalloc(int num) {if (image[num].kern_buf) {#ifdef VME_DEBUG -printk (KERN_DEBUG "UniverseII:Releasing buffer at %p\n" , - image[num].pci_buf); +pr_debug ("UniverseII:Releasing buffer at %p\n" , + image[num].pci_buf);#endif vme_free_consistent(image[num].resource, image[num].size_buf,
@@ -612,7 +610,7 @@ static void buf_unalloc(int num) #ifdef VME_DEBUG }else { -printk (KERN_DEBUG "UniverseII: Buffer not allocated\n" ); +pr_debug ("UniverseII: Buffer not allocated\n" );#endif } }
@@ -629,11 +627,10 @@ static int __init vme_user_init(void) {int retval =0 ; -printk (KERN_INFO "VME User Space Access Driver\n" ); +pr_info ("VME User Space Access Driver\n" );if (bus_num ==0 ) { -printk (KERN_ERR "%s: No cards, skipping registration\n" , - driver_name); +pr_err ("No cards, skipping registration\n" ); retval = -ENODEV ; goto err_nocard; }
@@ -642,8 +639,8 @@ static int __init vme_user_init(void)* in future revisions if that ever becomes necessary. */ if (bus_num >VME_USER_BUS_MAX ) { -printk (KERN_ERR "%s: Driver only able to handle %d buses\n" , - driver_name,VME_USER_BUS_MAX ); +pr_err ("Driver only able to handle %d buses\n" , +VME_USER_BUS_MAX ); bus_num =VME_USER_BUS_MAX ; }
@@ -683,8 +680,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)/* Save pointer to the bridge device */ if (vme_user_bridge !=NULL ) { -printk (KERN_ERR "%s: Driver can only be loaded for 1 device\n" , - driver_name); +pr_err ("Driver can only be loaded for 1 device\n" ); err = -EINVAL ; goto err_dev; }
@@ -707,8 +703,8 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) err =register_chrdev_region (MKDEV (VME_MAJOR ,0 ),VME_DEVS , driver_name);if (err) { -printk (KERN_WARNING "%s: Error getting Major Number %d for " -"driver.\n" , driver_name,VME_MAJOR ); +pr_warn ("Error getting Major Number %d for driver.\n" , +VME_MAJOR ); goto err_region; }
@@ -718,7 +714,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) vme_user_cdev->owner =THIS_MODULE ; err =cdev_add (vme_user_cdev,MKDEV (VME_MAJOR ,0 ),VME_DEVS );if (err) { -printk (KERN_WARNING "%s: cdev_all failed\n" , driver_name); +pr_warn ("cdev_all failed\n" ); goto err_char; }
@@ -732,16 +728,14 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].resource =vme_slave_request (vme_user_bridge,VME_A24 ,VME_SCT );if (image[i].resource ==NULL ) { -printk (KERN_WARNING "Unable to allocate slave " -"resource\n" ); +pr_warn ("Unable to allocate slave resource\n" ); goto err_slave; } image[i].size_buf =PCI_BUF_SIZE ; image[i].kern_buf =vme_alloc_consistent (image[i].resource, image[i].size_buf, &image[i].pci_buf);if (image[i].kern_buf ==NULL ) { -printk (KERN_WARNING "Unable to allocate memory for " -"buffer\n" ); +pr_warn ("Unable to allocate memory for buffer\n" ); image[i].pci_buf =0 ;vme_slave_free (image[i].resource); err = -ENOMEM ;
@@ -758,15 +752,13 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].resource =vme_master_request (vme_user_bridge,VME_A32 ,VME_SCT ,VME_D32 );if (image[i].resource ==NULL ) { -printk (KERN_WARNING "Unable to allocate master " -"resource\n" ); +pr_warn ("Unable to allocate master resource\n" ); goto err_master; } image[i].size_buf =PCI_BUF_SIZE ; image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { -printk (KERN_WARNING "Unable to allocate memory for " -"master window buffers\n" ); +pr_warn ("Unable to allocate memory for master window buffers\n" ); err = -ENOMEM ; goto err_master_buf; }
@@ -775,7 +767,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)/* Create sysfs entries - on udev systems this creates the dev files */ vme_user_sysfs_class =class_create (THIS_MODULE , driver_name);if (IS_ERR (vme_user_sysfs_class)) { -printk (KERN_ERR "Error creating vme_user class.\n" ); +pr_err ("Error creating vme_user class.\n" ); err =PTR_ERR (vme_user_sysfs_class); goto err_class; }
@@ -803,8 +795,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].device =device_create (vme_user_sysfs_class,NULL ,MKDEV (VME_MAJOR , i),NULL , name, num);if (IS_ERR (image[i].device)) { -printk (KERN_INFO "%s: Error creating sysfs device\n" , - driver_name); +pr_info ("Error creating sysfs device\n" ); err =PTR_ERR (image[i].device); goto err_sysfs; }
Signature · 1 line
1.7.9.5
Greg Kroah-Hartman
maintainerRe: [PATCH 2/3] staging/vme: Use pr_ printks in vme_user.c
Quoted 8 lines · Toshiaki Yamane
The below checkpatch warnings was fixed,
(quoted diff) +0
-4-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...and added
pr_fmt.
A lot of these can be converted to use dev_info(), dev_debug(), dev_warn(), and dev_err() instead. Please do that whenever you have access to a struct device.
So, sorry, I can't take this patch.
greg k-h
PATCH 1/2 staging/vme: Use pr_ printks in vme_user.c
The below checkpatch warnings was fixed,
-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
and added pr_fmt.
--- drivers/staging/vme/devices/vme_user.c | 37 ++++++++++++++------------------ 1 file changed, 16 insertions(+), 21 deletions(-)
drivers/staging/vme/devices/vme_user.c +16 -21
@@ -15,6 +15,8 @@* option) any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/cdev.h> #include <linux/delay.h> #include <linux/device.h>
@@ -629,11 +631,10 @@ static int __init vme_user_init(void) {int retval =0 ; -printk (KERN_INFO "VME User Space Access Driver\n" ); +pr_info ("VME User Space Access Driver\n" );if (bus_num ==0 ) { -printk (KERN_ERR "%s: No cards, skipping registration\n" , - driver_name); +pr_err ("No cards, skipping registration\n" ); retval = -ENODEV ; goto err_nocard; }
@@ -642,8 +643,8 @@ static int __init vme_user_init(void)* in future revisions if that ever becomes necessary. */ if (bus_num >VME_USER_BUS_MAX ) { -printk (KERN_ERR "%s: Driver only able to handle %d buses\n" , - driver_name,VME_USER_BUS_MAX ); +pr_err ("Driver only able to handle %d buses\n" , +VME_USER_BUS_MAX ); bus_num =VME_USER_BUS_MAX ; }
@@ -683,8 +684,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)/* Save pointer to the bridge device */ if (vme_user_bridge !=NULL ) { -printk (KERN_ERR "%s: Driver can only be loaded for 1 device\n" , - driver_name); +pr_err ("Driver can only be loaded for 1 device\n" ); err = -EINVAL ; goto err_dev; }
@@ -707,8 +707,8 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) err =register_chrdev_region (MKDEV (VME_MAJOR ,0 ),VME_DEVS , driver_name);if (err) { -printk (KERN_WARNING "%s: Error getting Major Number %d for " -"driver.\n" , driver_name,VME_MAJOR ); +pr_warn ("Error getting Major Number %d for driver.\n" , +VME_MAJOR ); goto err_region; }
@@ -718,7 +718,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) vme_user_cdev->owner =THIS_MODULE ; err =cdev_add (vme_user_cdev,MKDEV (VME_MAJOR ,0 ),VME_DEVS );if (err) { -printk (KERN_WARNING "%s: cdev_all failed\n" , driver_name); +pr_warn ("cdev_all failed\n" ); goto err_char; }
@@ -732,16 +732,14 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].resource =vme_slave_request (vme_user_bridge,VME_A24 ,VME_SCT );if (image[i].resource ==NULL ) { -printk (KERN_WARNING "Unable to allocate slave " -"resource\n" ); +pr_warn ("Unable to allocate slave resource\n" ); goto err_slave; } image[i].size_buf =PCI_BUF_SIZE ; image[i].kern_buf =vme_alloc_consistent (image[i].resource, image[i].size_buf, &image[i].pci_buf);if (image[i].kern_buf ==NULL ) { -printk (KERN_WARNING "Unable to allocate memory for " -"buffer\n" ); +pr_warn ("Unable to allocate memory for buffer\n" ); image[i].pci_buf =0 ;vme_slave_free (image[i].resource); err = -ENOMEM ;
@@ -758,15 +756,13 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].resource =vme_master_request (vme_user_bridge,VME_A32 ,VME_SCT ,VME_D32 );if (image[i].resource ==NULL ) { -printk (KERN_WARNING "Unable to allocate master " -"resource\n" ); +pr_warn ("Unable to allocate master resource\n" ); goto err_master; } image[i].size_buf =PCI_BUF_SIZE ; image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { -printk (KERN_WARNING "Unable to allocate memory for " -"master window buffers\n" ); +pr_warn ("Unable to allocate memory for master window buffers\n" ); err = -ENOMEM ; goto err_master_buf; }
@@ -775,7 +771,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)/* Create sysfs entries - on udev systems this creates the dev files */ vme_user_sysfs_class =class_create (THIS_MODULE , driver_name);if (IS_ERR (vme_user_sysfs_class)) { -printk (KERN_ERR "Error creating vme_user class.\n" ); +pr_err ("Error creating vme_user class.\n" ); err =PTR_ERR (vme_user_sysfs_class); goto err_class; }
@@ -803,8 +799,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].device =device_create (vme_user_sysfs_class,NULL ,MKDEV (VME_MAJOR , i),NULL , name, num);if (IS_ERR (image[i].device)) { -printk (KERN_INFO "%s: Error creating sysfs device\n" , - driver_name); +pr_info ("Error creating sysfs device\n" ); err =PTR_ERR (image[i].device); goto err_sysfs; }
Signature · 1 line
1.7.9.5
PATCH 2/2 staging/vme: Use dev_ printks in vme_user.c
The below checkpatch warnings was fixed,
-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
--- drivers/staging/vme/devices/vme_user.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-)
drivers/staging/vme/devices/vme_user.c +14 -18
@@ -172,7 +172,7 @@ static int vme_user_open(struct inode *inode, struct file *file)mutex_lock (&image[minor].mutex);/* Allow device to be opened if a resource is needed and allocated. */ if (minor <CONTROL_MINOR && image[minor].resource ==NULL ) { -printk (KERN_ERR "No resources allocated for device\n" ); +dev_err (image[minor].device,"No resources allocated for device\n" ); err = -EINVAL ; goto err_res; }
@@ -227,13 +227,13 @@ static ssize_t resource_to_user(int minor, char __user *buf, size_t count, (unsigned long)copied);if (retval !=0 ) { copied = (copied - retval); -printk (KERN_INFO "User copy failed\n" ); +dev_info (image[minor].device,"User copy failed\n" );return -EINVAL ; } }else {/* XXX Need to write this */ -printk (KERN_INFO "Currently don't support large transfers\n" ); +dev_info (image[minor].device,"Currently don't support large transfers\n" );/* Map in pages from userspace */ /* Call vme_master_read to do the transfer */
@@ -267,7 +267,7 @@ static ssize_t resource_from_user(unsigned int minor, const char __user *buf, image[minor].kern_buf, copied, *ppos); }else {/* XXX Need to write this */ -printk (KERN_INFO "Currently don't support large transfers\n" ); +dev_info (image[minor].device,"Currently don't support large transfers\n" );/* Map in pages from userspace */ /* Call vme_master_write to do the transfer */
@@ -288,7 +288,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf, retval =__copy_to_user (buf, image_ptr, (unsigned long )count);if (retval !=0 ) { retval = (count - retval); -printk (KERN_WARNING "Partial copy to userspace\n" ); +dev_warn (image[minor].device,"Partial copy to userspace\n" ); }else retval = count;
@@ -307,7 +307,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char __user *buf, retval =__copy_from_user (image_ptr, buf, (unsigned long )count);if (retval !=0 ) { retval = (count - retval); -printk (KERN_WARNING "Partial copy to userspace\n" ); +dev_warn (image[minor].device,"Partial copy to userspace\n" ); }else retval = count;
@@ -478,7 +478,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&irq_req, argp,sizeof (struct vme_irq_id ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from userspace\n" ); +dev_warn (image[minor].device,"Partial copy from userspace\n" );return -EFAULT ; }
@@ -505,8 +505,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_to_user (argp, &master,sizeof (struct vme_master ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy to " -"userspace\n" ); +dev_warn (image[minor].device,"Partial copy to userspace\n" );return -EFAULT ; }
@@ -517,8 +516,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&master, argp,sizeof (master));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from " -"userspace\n" ); +dev_warn (image[minor].device,"Partial copy from userspace\n" );return -EFAULT ; }
@@ -548,8 +546,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_to_user (argp, &slave,sizeof (struct vme_slave ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy to " -"userspace\n" ); +dev_warn (image[minor].device,"Partial copy to userspace\n" );return -EFAULT ; }
@@ -560,8 +557,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&slave, argp,sizeof (slave));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from " -"userspace\n" ); +dev_warn (image[minor].device,"Partial copy from userspace\n" );return -EFAULT ; }
@@ -601,8 +597,8 @@ static void buf_unalloc(int num) {if (image[num].kern_buf) {#ifdef VME_DEBUG -printk (KERN_DEBUG "UniverseII:Releasing buffer at %p\n" , - image[num].pci_buf); +dev_debug (image[num].device,"UniverseII:Releasing buffer at %p\n" , + image[num].pci_buf);#endif vme_free_consistent(image[num].resource, image[num].size_buf,
@@ -614,7 +610,7 @@ static void buf_unalloc(int num) #ifdef VME_DEBUG }else { -printk (KERN_DEBUG "UniverseII: Buffer not allocated\n" ); +dev_debug (image[num].device,"UniverseII: Buffer not allocated\n" );#endif } }
Signature · 1 line
1.7.9.5
Greg Kroah-Hartman
maintainerRe: [PATCH 2/2] staging/vme: Use dev_ printks in vme_user.c
Quoted 8 lines · Toshiaki Yamane
The below checkpatch warnings was fixed,
(quoted diff) +0
-4-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...Signed-off-by Toshiaki Yamane <[email protected]>
Same comment at 1/2 applies here as well.
greg k-h
Greg Kroah-Hartman
maintainerRe: [PATCH 1/2] staging/vme: Use pr_ printks in vme_user.c
In reply to Toshiaki YamaneReview
Quoted 5 lines · Toshiaki Yamane
The below checkpatch warnings was fixed,
(quoted diff) +0
-3-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
A lot of these can be using dev_* instead of the pr_* functions, right? Please convert to using them wherever possible.
Because of that, I can't take this patch, sorry. Care to redo it?
thanks,
greg k-h
Re: [PATCH 1/2] staging/vme: Use pr_ printks in vme_user.c
Quoted 11 lines · Greg Kroah-Hartman
Review
Quoted 5 lines · Toshiaki Yamane
The below checkpatch warnings was fixed,
(quoted diff) +0
-3-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...A lot of these can be using dev_* instead of the pr_* functions, right? Please convert to using them wherever possible.
Because of that, I can't take this patch, sorry. Care to redo it?
Yes. Is this collect?
I must use dev_* procedure when the following conditions are met:
- If I have access to struct device object by the argument of the procedure
- Except for the right: struct net_device, etc.
Otherwise, I must use pr_* procedure.
Regards,
YAMANE Toshiaki
Greg Kroah-Hartman
maintainerRe: [PATCH 1/2] staging/vme: Use pr_ printks in vme_user.c
Quoted 12 lines · Toshiaki Yamane
Quoted 10 lines · Greg Kroah-Hartman
Review
Quoted 5 lines · Toshiaki Yamane
The below checkpatch warnings was fixed,
(quoted diff) +0
-3-WARNING: Prefer pr_info(... to printk(KERN_INFO, ... -WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ... -WARNING: Prefer pr_err(... to printk(KERN_ERR, ...A lot of these can be using dev_* instead of the pr_* functions, right? Please convert to using them wherever possible.
Quoted 3 lines
Quoted 1 line
Because of that, I can't take this patch, sorry. Care to redo it?
Yes. Is this collect?
"correct"?
Quoted 5 lines
I must use dev_* procedure when the following conditions are met:
- If I have access to struct device object by the argument of the procedure
- Except for the right: structnet_device, etc.Otherwise, I must use pr_* procedure.
Yes, that is correct :)
greg k-h
PATCH 3/3 staging/vme: Use pr_ printks in vme_pio2_core.c
In reply to Dan CarpenterThe below checkpatch warnings was fixed,
-WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
and added pr_fmt.
--- drivers/staging/vme/devices/vme_pio2_core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/vme/devices/vme_pio2_core.c +5 -5
@@ -10,6 +10,8 @@* option) any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h>
@@ -163,15 +165,13 @@ static int __init pio2_init(void)int retval =0 ;if (bus_num ==0 ) { -printk (KERN_ERR "%s: No cards, skipping registration\n" , - driver_name); +pr_err ("No cards, skipping registration\n" ); goto err_nocard; }if (bus_num >PIO2_CARDS_MAX ) { -printk (KERN_ERR -"%s: Driver only able to handle %d PIO2 Cards\n" , - driver_name,PIO2_CARDS_MAX ); +pr_err ("Driver only able to handle %d PIO2 Cards\n" , +PIO2_CARDS_MAX ); bus_num =PIO2_CARDS_MAX ; }
Signature · 1 line
1.7.9.5
PATCH 3/5 staging/vme: fix checkpatch warning
In reply to Toshiaki YamaneThe below checkpatch warnings was fixed.
-WARNING: Prefer pr_debug(... to printk(KERN_DEBUG, ...
--- drivers/staging/vme/devices/vme_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/vme/devices/vme_user.c +3 -3
@@ -601,8 +601,8 @@ static void buf_unalloc(int num) {if (image[num].kern_buf) {#ifdef VME_DEBUG -printk (KERN_DEBUG "UniverseII:Releasing buffer at %p\n" , - image[num].pci_buf); +pr_debug ("UniverseII:Releasing buffer at %p\n" , + image[num].pci_buf);#endif vme_free_consistent(image[num].resource, image[num].size_buf,
@@ -614,7 +614,7 @@ static void buf_unalloc(int num) #ifdef VME_DEBUG }else { -printk (KERN_DEBUG "UniverseII: Buffer not allocated\n" ); +pr_debug ("UniverseII: Buffer not allocated\n" );#endif } }
Signature · 1 line
1.7.9.5
PATCH 4/5 staging/vme: fix checkpatch warning
In reply to Toshiaki YamaneThe below checkpatch warnings was fixed.
-WARNING: Prefer pr_warn(... to printk(KERN_WARNING, ...
--- drivers/staging/vme/devices/vme_user.c | 36 +++++++++++++------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
drivers/staging/vme/devices/vme_user.c +14 -22
@@ -288,7 +288,7 @@ static ssize_t buffer_to_user(unsigned int minor, char __user *buf, retval =__copy_to_user (buf, image_ptr, (unsigned long )count);if (retval !=0 ) { retval = (count - retval); -printk (KERN_WARNING "Partial copy to userspace\n" ); +pr_warn ("Partial copy to userspace\n" ); }else retval = count;
@@ -307,7 +307,7 @@ static ssize_t buffer_from_user(unsigned int minor, const char __user *buf, retval =__copy_from_user (image_ptr, buf, (unsigned long )count);if (retval !=0 ) { retval = (count - retval); -printk (KERN_WARNING "Partial copy to userspace\n" ); +pr_warn ("Partial copy to userspace\n" ); }else retval = count;
@@ -478,7 +478,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&irq_req, argp,sizeof (struct vme_irq_id ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from userspace\n" ); +pr_warn ("Partial copy from userspace\n" );return -EFAULT ; }
@@ -505,8 +505,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_to_user (argp, &master,sizeof (struct vme_master ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy to " -"userspace\n" ); +pr_warn ("Partial copy to userspace\n" );return -EFAULT ; }
@@ -517,8 +516,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&master, argp,sizeof (master));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from " -"userspace\n" ); +pr_warn ("Partial copy from userspace\n" );return -EFAULT ; }
@@ -548,8 +546,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_to_user (argp, &slave,sizeof (struct vme_slave ));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy to " -"userspace\n" ); +pr_warn ("Partial copy to userspace\n" );return -EFAULT ; }
@@ -560,8 +557,7 @@ static int vme_user_ioctl(struct inode *inode, struct file *file, copied =copy_from_user (&slave, argp,sizeof (slave));if (copied !=0 ) { -printk (KERN_WARNING "Partial copy from " -"userspace\n" ); +pr_warn ("Partial copy from userspace\n" );return -EFAULT ; }
@@ -709,8 +705,8 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) err =register_chrdev_region (MKDEV (VME_MAJOR ,0 ),VME_DEVS , driver_name);if (err) { -printk (KERN_WARNING "%s: Error getting Major Number %d for " -"driver.\n" , driver_name,VME_MAJOR ); +pr_warn ("Error getting Major Number %d for driver.\n" , +VME_MAJOR ); goto err_region; }
@@ -720,7 +716,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) vme_user_cdev->owner =THIS_MODULE ; err =cdev_add (vme_user_cdev,MKDEV (VME_MAJOR ,0 ),VME_DEVS );if (err) { -printk (KERN_WARNING "%s: cdev_all failed\n" , driver_name); +pr_warn ("cdev_all failed\n" ); goto err_char; }
@@ -734,16 +730,14 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].resource =vme_slave_request (vme_user_bridge,VME_A24 ,VME_SCT );if (image[i].resource ==NULL ) { -printk (KERN_WARNING "Unable to allocate slave " -"resource\n" ); +pr_warn ("Unable to allocate slave resource\n" ); goto err_slave; } image[i].size_buf =PCI_BUF_SIZE ; image[i].kern_buf =vme_alloc_consistent (image[i].resource, image[i].size_buf, &image[i].pci_buf);if (image[i].kern_buf ==NULL ) { -printk (KERN_WARNING "Unable to allocate memory for " -"buffer\n" ); +pr_warn ("Unable to allocate memory for buffer\n" ); image[i].pci_buf =0 ;vme_slave_free (image[i].resource); err = -ENOMEM ;
@@ -760,15 +754,13 @@ static int __devinit vme_user_probe(struct vme_dev *vdev) image[i].resource =vme_master_request (vme_user_bridge,VME_A32 ,VME_SCT ,VME_D32 );if (image[i].resource ==NULL ) { -printk (KERN_WARNING "Unable to allocate master " -"resource\n" ); +pr_warn ("Unable to allocate master resource\n" ); goto err_master; } image[i].size_buf =PCI_BUF_SIZE ; image[i].kern_buf =kmalloc (image[i].size_buf,GFP_KERNEL );if (image[i].kern_buf ==NULL ) { -printk (KERN_WARNING "Unable to allocate memory for " -"master window buffers\n" ); +pr_warn ("Unable to allocate memory for master window buffers\n" ); err = -ENOMEM ; goto err_master_buf; }
Signature · 1 line
1.7.9.5
PATCH 5/5 staging/vme: fix checkpatch warning
In reply to Toshiaki YamaneThe below checkpatch warnings was fixed,
-WARNING: Prefer pr_err(... to printk(KERN_ERR, ...
and added pr_fmt.
--- drivers/staging/vme/devices/vme_pio2_core.c | 10 +++++----- drivers/staging/vme/devices/vme_user.c | 14 ++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-)
drivers/staging/vme/devices/vme_pio2_core.c +5 -5
@@ -10,6 +10,8 @@* option) any later version. */ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/types.h>
@@ -163,15 +165,13 @@ static int __init pio2_init(void)int retval =0 ;if (bus_num ==0 ) { -printk (KERN_ERR "%s: No cards, skipping registration\n" , - driver_name); +pr_err ("No cards, skipping registration\n" ); goto err_nocard; }if (bus_num >PIO2_CARDS_MAX ) { -printk (KERN_ERR -"%s: Driver only able to handle %d PIO2 Cards\n" , - driver_name,PIO2_CARDS_MAX ); +pr_err ("Driver only able to handle %d PIO2 Cards\n" , +PIO2_CARDS_MAX ); bus_num =PIO2_CARDS_MAX ; }
drivers/staging/vme/devices/vme_user.c +6 -8
@@ -172,7 +172,7 @@ static int vme_user_open(struct inode *inode, struct file *file)mutex_lock (&image[minor].mutex);/* Allow device to be opened if a resource is needed and allocated. */ if (minor <CONTROL_MINOR && image[minor].resource ==NULL ) { -printk (KERN_ERR "No resources allocated for device\n" ); +pr_err ("No resources allocated for device\n" ); err = -EINVAL ; goto err_res; }
@@ -630,8 +630,7 @@ static int __init vme_user_init(void)pr_info ("VME User Space Access Driver\n" );if (bus_num ==0 ) { -printk (KERN_ERR "%s: No cards, skipping registration\n" , - driver_name); +pr_err ("No cards, skipping registration\n" ); retval = -ENODEV ; goto err_nocard; }
@@ -640,8 +639,8 @@ static int __init vme_user_init(void)* in future revisions if that ever becomes necessary. */ if (bus_num >VME_USER_BUS_MAX ) { -printk (KERN_ERR "%s: Driver only able to handle %d buses\n" , - driver_name,VME_USER_BUS_MAX ); +pr_err ("Driver only able to handle %d buses\n" , +VME_USER_BUS_MAX ); bus_num =VME_USER_BUS_MAX ; }
@@ -681,8 +680,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)/* Save pointer to the bridge device */ if (vme_user_bridge !=NULL ) { -printk (KERN_ERR "%s: Driver can only be loaded for 1 device\n" , - driver_name); +pr_err ("Driver can only be loaded for 1 device\n" ); err = -EINVAL ; goto err_dev; }
@@ -769,7 +767,7 @@ static int __devinit vme_user_probe(struct vme_dev *vdev)/* Create sysfs entries - on udev systems this creates the dev files */ vme_user_sysfs_class =class_create (THIS_MODULE , driver_name);if (IS_ERR (vme_user_sysfs_class)) { -printk (KERN_ERR "Error creating vme_user class.\n" ); +pr_err ("Error creating vme_user class.\n" ); err =PTR_ERR (vme_user_sysfs_class); goto err_class; }
Signature · 1 line
1.7.9.5