aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-20 16:53:29 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-04-20 16:53:29 -0700
commit2b8dec323d3409308817820247222806d0356cdf (patch)
tree60dcceac600006d858c92ba1d2a897caa982d25c /drivers
parentc2705c0d2d8776e7e51dd0dfa8edf9e6c629902b (diff)
USB: driver.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: Markus Grabner <grabner@icg.tugraz.at> CC: Stefan Hajnoczi <stefanha@gmail.com> CC: Julia Lawall <julia@diku.dk> CC: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/line6/driver.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
index e8023afd365..2e602e192b0 100644
--- a/drivers/staging/line6/driver.c
+++ b/drivers/staging/line6/driver.c
@@ -1307,7 +1307,8 @@ static int __init line6_init(void)
retval = usb_register(&line6_driver);
if (retval) {
- err("usb_register failed. Error number %d", retval);
+ printk(KERN_ERR KBUILD_MODNAME
+ ": usb_register failed. Error number %d\n", retval);
return retval;
}
@@ -1315,7 +1316,7 @@ static int __init line6_init(void)
GFP_KERNEL);
if (line6_request_version == NULL) {
- err("Out of memory");
+ printk(KERN_ERR KBUILD_MODNAME ":Out of memory\n");
return -ENOMEM;
}