From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 21:48:30 +0000 (-0700) Subject: USB: powermate.c: remove err() usage X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2385f3c3c757b6ffb766c320df4a7f7a45593f24;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git USB: powermate.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: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/input/misc/powermate.c b/drivers/input/misc/powermate.c index 538f7049ec64..71ec621fbefa 100644 --- a/drivers/input/misc/powermate.c +++ b/drivers/input/misc/powermate.c @@ -110,8 +110,9 @@ static void powermate_irq(struct urb *urb) exit: retval = usb_submit_urb (urb, GFP_ATOMIC); if (retval) - err ("%s - usb_submit_urb failed with result %d", - __func__, retval); + dev_err(&pm->udev->dev, + "%s - usb_submit_urb failed with result: %d\n", + __func__, retval); } /* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */