Skip to content

Commit

Permalink
USB: asus_oled.c: remove err() usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Apr 20, 2012
1 parent b9ee17b commit fc433de
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/asus_oled/asus_oled.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit fc433de

Please sign in to comment.