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

Input: serio - use pr_xxx() and dev_xxx() helpers

pr_xxx() and dev_xxx() helpers ensure that all messages emitted by the
module have consistent prefixes, so let's use them. Also fix some
formatting issues.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

+35 -42
+35 -42
drivers/input/serio/serio.c
··· 26 26 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic 27 27 */ 28 28 29 + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 30 + 29 31 #include <linux/stddef.h> 30 32 #include <linux/module.h> 31 33 #include <linux/serio.h> ··· 121 119 122 120 error = device_bind_driver(&serio->dev); 123 121 if (error) { 124 - printk(KERN_WARNING 125 - "serio: device_bind_driver() failed " 126 - "for %s (%s) and %s, error: %d\n", 127 - serio->phys, serio->name, 128 - drv->description, error); 122 + dev_warn(&serio->dev, 123 + "device_bind_driver() failed for %s (%s) and %s, error: %d\n", 124 + serio->phys, serio->name, 125 + drv->description, error); 129 126 serio_disconnect_driver(serio); 130 127 serio->dev.driver = NULL; 131 128 return error; ··· 139 138 140 139 error = device_attach(&serio->dev); 141 140 if (error < 0) 142 - printk(KERN_WARNING 143 - "serio: device_attach() failed for %s (%s), error: %d\n", 144 - serio->phys, serio->name, error); 141 + dev_warn(&serio->dev, 142 + "device_attach() failed for %s (%s), error: %d\n", 143 + serio->phys, serio->name, error); 145 144 } 146 145 147 146 ··· 195 194 196 195 event = kmalloc(sizeof(struct serio_event), GFP_ATOMIC); 197 196 if (!event) { 198 - printk(KERN_ERR 199 - "serio: Not enough memory to queue event %d\n", 200 - event_type); 197 + pr_err("Not enough memory to queue event %d\n", event_type); 201 198 retval = -ENOMEM; 202 199 goto out; 203 200 } 204 201 205 202 if (!try_module_get(owner)) { 206 - printk(KERN_WARNING 207 - "serio: Can't get module reference, dropping event %d\n", 208 - event_type); 203 + pr_warning("Can't get module reference, dropping event %d\n", 204 + event_type); 209 205 kfree(event); 210 206 retval = -EINVAL; 211 207 goto out; ··· 284 286 if ((event = serio_get_event())) { 285 287 286 288 switch (event->type) { 287 - case SERIO_REGISTER_PORT: 288 - serio_add_port(event->object); 289 - break; 290 289 291 - case SERIO_RECONNECT_PORT: 292 - serio_reconnect_port(event->object); 293 - break; 290 + case SERIO_REGISTER_PORT: 291 + serio_add_port(event->object); 292 + break; 294 293 295 - case SERIO_RESCAN_PORT: 296 - serio_disconnect_port(event->object); 297 - serio_find_driver(event->object); 298 - break; 294 + case SERIO_RECONNECT_PORT: 295 + serio_reconnect_port(event->object); 296 + break; 299 297 300 - case SERIO_RECONNECT_CHAIN: 301 - serio_reconnect_chain(event->object); 302 - break; 298 + case SERIO_RESCAN_PORT: 299 + serio_disconnect_port(event->object); 300 + serio_find_driver(event->object); 301 + break; 303 302 304 - case SERIO_ATTACH_DRIVER: 305 - serio_attach_driver(event->object); 306 - break; 303 + case SERIO_RECONNECT_CHAIN: 304 + serio_reconnect_chain(event->object); 305 + break; 307 306 308 - default: 309 - break; 307 + case SERIO_ATTACH_DRIVER: 308 + serio_attach_driver(event->object); 309 + break; 310 310 } 311 311 312 312 serio_remove_duplicate_events(event); ··· 374 378 kthread_should_stop() || !list_empty(&serio_event_list)); 375 379 } while (!kthread_should_stop()); 376 380 377 - printk(KERN_DEBUG "serio: kseriod exiting\n"); 378 381 return 0; 379 382 } 380 383 ··· 560 565 561 566 error = device_add(&serio->dev); 562 567 if (error) 563 - printk(KERN_ERR 564 - "serio: device_add() failed for %s (%s), error: %d\n", 568 + dev_err(&serio->dev, 569 + "device_add() failed for %s (%s), error: %d\n", 565 570 serio->phys, serio->name, error); 566 571 } 567 572 ··· 788 793 789 794 error = driver_attach(&drv->driver); 790 795 if (error) 791 - printk(KERN_WARNING 792 - "serio: driver_attach() failed for %s with error %d\n", 793 - drv->driver.name, error); 796 + pr_warning("driver_attach() failed for %s with error %d\n", 797 + drv->driver.name, error); 794 798 } 795 799 796 800 int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name) ··· 809 815 810 816 error = driver_register(&drv->driver); 811 817 if (error) { 812 - printk(KERN_ERR 813 - "serio: driver_register() failed for %s, error: %d\n", 818 + pr_err("driver_register() failed for %s, error: %d\n", 814 819 drv->driver.name, error); 815 820 return error; 816 821 } ··· 1006 1013 1007 1014 error = bus_register(&serio_bus); 1008 1015 if (error) { 1009 - printk(KERN_ERR "serio: failed to register serio bus, error: %d\n", error); 1016 + pr_err("Failed to register serio bus, error: %d\n", error); 1010 1017 return error; 1011 1018 } 1012 1019 ··· 1014 1021 if (IS_ERR(serio_task)) { 1015 1022 bus_unregister(&serio_bus); 1016 1023 error = PTR_ERR(serio_task); 1017 - printk(KERN_ERR "serio: Failed to start kseriod, error: %d\n", error); 1024 + pr_err("Failed to start kseriod, error: %d\n", error); 1018 1025 return error; 1019 1026 } 1020 1027