Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: ftdi-elan: Use pr_<level>

Use a more current logging style.

Add pr_fmt to prefix messages appropriately.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Joe Perches and committed by
Greg Kroah-Hartman
8355d39c a92cec27

+9 -9
+9 -9
drivers/usb/misc/ftdi-elan.c
··· 35 35 * via an ELAN U132 adapter. 36 36 * 37 37 */ 38 + 39 + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 40 + 38 41 #include <linux/kernel.h> 39 42 #include <linux/errno.h> 40 43 #include <linux/init.h> ··· 626 623 interface = usb_find_interface(&ftdi_elan_driver, subminor); 627 624 628 625 if (!interface) { 629 - printk(KERN_ERR "can't find device for minor %d\n", subminor); 626 + pr_err("can't find device for minor %d\n", subminor); 630 627 return -ENODEV; 631 628 } else { 632 629 struct usb_ftdi *ftdi = usb_get_intfdata(interface); ··· 2725 2722 struct usb_ftdi *ftdi; 2726 2723 2727 2724 ftdi = kzalloc(sizeof(struct usb_ftdi), GFP_KERNEL); 2728 - if (!ftdi) { 2729 - printk(KERN_ERR "Out of memory\n"); 2725 + if (!ftdi) 2730 2726 return -ENOMEM; 2731 - } 2732 2727 2733 2728 mutex_lock(&ftdi_module_lock); 2734 2729 list_add_tail(&ftdi->ftdi_list, &ftdi_static_list); ··· 2850 2849 static int __init ftdi_elan_init(void) 2851 2850 { 2852 2851 int result; 2853 - printk(KERN_INFO "driver %s\n", ftdi_elan_driver.name); 2852 + pr_info("driver %s\n", ftdi_elan_driver.name); 2854 2853 mutex_init(&ftdi_module_lock); 2855 2854 INIT_LIST_HEAD(&ftdi_static_list); 2856 2855 status_queue = create_singlethread_workqueue("ftdi-status-control"); ··· 2867 2866 destroy_workqueue(status_queue); 2868 2867 destroy_workqueue(command_queue); 2869 2868 destroy_workqueue(respond_queue); 2870 - printk(KERN_ERR "usb_register failed. Error number %d\n", 2871 - result); 2869 + pr_err("usb_register failed. Error number %d\n", result); 2872 2870 } 2873 2871 return result; 2874 2872 ··· 2876 2876 err_command_queue: 2877 2877 destroy_workqueue(status_queue); 2878 2878 err_status_queue: 2879 - printk(KERN_ERR "%s couldn't create workqueue\n", ftdi_elan_driver.name); 2879 + pr_err("%s couldn't create workqueue\n", ftdi_elan_driver.name); 2880 2880 return -ENOMEM; 2881 2881 } 2882 2882 ··· 2885 2885 struct usb_ftdi *ftdi; 2886 2886 struct usb_ftdi *temp; 2887 2887 usb_deregister(&ftdi_elan_driver); 2888 - printk(KERN_INFO "ftdi_u132 driver deregistered\n"); 2888 + pr_info("ftdi_u132 driver deregistered\n"); 2889 2889 list_for_each_entry_safe(ftdi, temp, &ftdi_static_list, ftdi_list) { 2890 2890 ftdi_status_cancel_work(ftdi); 2891 2891 ftdi_command_cancel_work(ftdi);