From 8048926bb898730b41c4c2698e9aefb16870488c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 14:48:57 -0700 Subject: [PATCH] USB: as102_usb_drv.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: Mauro Carvalho Chehab CC: Sylwester Nawrocki CC: Piotr Chmura CC: Devin Heitmueller CC: Gianluca Gennari Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/as102/as102_usb_drv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/as102/as102_usb_drv.c b/drivers/staging/media/as102/as102_usb_drv.c index 0f6bfe7..6875c88 100644 --- a/drivers/staging/media/as102/as102_usb_drv.c +++ b/drivers/staging/media/as102/as102_usb_drv.c @@ -375,7 +375,7 @@ static int as102_usb_probe(struct usb_interface *intf, as102_dev = kzalloc(sizeof(struct as102_dev_t), GFP_KERNEL); if (as102_dev == NULL) { - err("%s: kzalloc failed", __func__); + dev_err(&intf->dev, "%s: kzalloc failed\n", __func__); return -ENOMEM; } @@ -411,8 +411,9 @@ static int as102_usb_probe(struct usb_interface *intf, ret = usb_register_dev(intf, &as102_usb_class_driver); if (ret < 0) { /* something prevented us from registering this driver */ - err("%s: usb_register_dev() failed (errno = %d)", - __func__, ret); + dev_err(&intf->dev, + "%s: usb_register_dev() failed (errno = %d)\n", + __func__, ret); goto failed; } -- 2.7.4