diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2016-11-10 17:12:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-29 14:25:34 -0500 |
commit | 826a4c6574efafdcfc292cdaf4dd2ccd6133d5f0 (patch) | |
tree | 2318cef29450ea2c862157692d573cf568bc11de | |
parent | 8056756441092098bf8f2bb764f2af2ab0e1d3ff (diff) |
ppdev: use pr_* macros
The coding style recommends not to use printk. Use pr_* macros.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/char/ppdev.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index f08f3ed98e01..85c63e49df7f 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
@@ -294,7 +294,7 @@ static int register_device(int minor, struct pp_struct *pp) | |||
294 | 294 | ||
295 | port = parport_find_number(minor); | 295 | port = parport_find_number(minor); |
296 | if (!port) { | 296 | if (!port) { |
297 | printk(KERN_WARNING "%s: no associated port!\n", name); | 297 | pr_warn("%s: no associated port!\n", name); |
298 | kfree(name); | 298 | kfree(name); |
299 | return -ENXIO; | 299 | return -ENXIO; |
300 | } | 300 | } |
@@ -308,7 +308,7 @@ static int register_device(int minor, struct pp_struct *pp) | |||
308 | kfree(name); | 308 | kfree(name); |
309 | 309 | ||
310 | if (!pdev) { | 310 | if (!pdev) { |
311 | printk(KERN_WARNING "%s: failed to register device!\n", name); | 311 | pr_warn("%s: failed to register device!\n", name); |
312 | return -ENXIO; | 312 | return -ENXIO; |
313 | } | 313 | } |
314 | 314 | ||
@@ -822,8 +822,7 @@ static int __init ppdev_init(void) | |||
822 | int err = 0; | 822 | int err = 0; |
823 | 823 | ||
824 | if (register_chrdev(PP_MAJOR, CHRDEV, &pp_fops)) { | 824 | if (register_chrdev(PP_MAJOR, CHRDEV, &pp_fops)) { |
825 | printk(KERN_WARNING CHRDEV ": unable to get major %d\n", | 825 | pr_warn(CHRDEV ": unable to get major %d\n", PP_MAJOR); |
826 | PP_MAJOR); | ||
827 | return -EIO; | 826 | return -EIO; |
828 | } | 827 | } |
829 | ppdev_class = class_create(THIS_MODULE, CHRDEV); | 828 | ppdev_class = class_create(THIS_MODULE, CHRDEV); |
@@ -833,11 +832,11 @@ static int __init ppdev_init(void) | |||
833 | } | 832 | } |
834 | err = parport_register_driver(&pp_driver); | 833 | err = parport_register_driver(&pp_driver); |
835 | if (err < 0) { | 834 | if (err < 0) { |
836 | printk(KERN_WARNING CHRDEV ": unable to register with parport\n"); | 835 | pr_warn(CHRDEV ": unable to register with parport\n"); |
837 | goto out_class; | 836 | goto out_class; |
838 | } | 837 | } |
839 | 838 | ||
840 | printk(KERN_INFO PP_VERSION "\n"); | 839 | pr_info(PP_VERSION "\n"); |
841 | goto out; | 840 | goto out; |
842 | 841 | ||
843 | out_class: | 842 | out_class: |