diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-20 16:53:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-23 16:45:54 -0700 |
| commit | 2682dee3158ef140320d6e1c5467a481dc954154 (patch) | |
| tree | d500bc2839c153704deb96d828621f29ab373629 | |
| parent | 8d0572504802742ae21f1aaa499478c4e23bd4ef (diff) | |
staging: 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>
| -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 83549d9cfef..510d7963921 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; } |