diff options
| author | Greg Kroah-Hartman | 2012-04-21 01:53:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-04-21 01:53:17 +0200 |
| commit | fc433dea4df4633b2277bc46c012b2a5a5fbdd0e (patch) | |
| tree | ffc61c73e30031e0f82041d8bfc278f132d5f2ee /drivers/staging/asus_oled | |
| parent | USB: serial: ipaq: delete duplicate id (diff) | |
| download | kernel-qcow2-linux-fc433dea4df4633b2277bc46c012b2a5a5fbdd0e.tar.gz kernel-qcow2-linux-fc433dea4df4633b2277bc46c012b2a5a5fbdd0e.tar.xz kernel-qcow2-linux-fc433dea4df4633b2277bc46c012b2a5a5fbdd0e.zip | |
USB: asus_oled.c: remove err() usage
err() was a very old USB-specific macro that I thought had
gone away. This patch removes it from being used in the
driver and uses dev_err() instead.
CC: Jakub Schmidtke <sjakub@gmail.com>
CC: Pekka Paalanen <pq@iki.fi>
CC: Peter Huewe <peterhuewe@gmx.de>
CC: "Ken O'Brien" <kernel@kenobrien.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/asus_oled')
| -rw-r--r-- | drivers/staging/asus_oled/asus_oled.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/asus_oled/asus_oled.c b/drivers/staging/asus_oled/asus_oled.c index 83549d9cfefc..510d79639217 100644 --- a/drivers/staging/asus_oled/asus_oled.c +++ b/drivers/staging/asus_oled/asus_oled.c @@ -782,20 +782,20 @@ static int __init asus_oled_init(void) oled_class = class_create(THIS_MODULE, ASUS_OLED_UNDERSCORE_NAME); if (IS_ERR(oled_class)) { - err("Error creating " ASUS_OLED_UNDERSCORE_NAME " class"); + printk(KERN_ERR "Error creating " ASUS_OLED_UNDERSCORE_NAME " class\n"); return PTR_ERR(oled_class); } retval = class_create_file(oled_class, &class_attr_version.attr); if (retval) { - err("Error creating class version file"); + printk(KERN_ERR "Error creating class version file\n"); goto error; } retval = usb_register(&oled_driver); if (retval) { - err("usb_register failed. Error number %d", retval); + printk(KERN_ERR "usb_register failed. Error number %d\n", retval); goto error; } |