diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:30 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 17:48:30 -0400 |
commit | 2385f3c3c757b6ffb766c320df4a7f7a45593f24 (patch) | |
tree | 778a04f1c9f4ec6dbc3e256bb8b99b6347d90856 | |
parent | 4efeca581bc84105c2e82d28a3a29e6cd9784204 (diff) |
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 <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/input/misc/powermate.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) | |||
110 | exit: | 110 | exit: |
111 | retval = usb_submit_urb (urb, GFP_ATOMIC); | 111 | retval = usb_submit_urb (urb, GFP_ATOMIC); |
112 | if (retval) | 112 | if (retval) |
113 | err ("%s - usb_submit_urb failed with result %d", | 113 | dev_err(&pm->udev->dev, |
114 | __func__, retval); | 114 | "%s - usb_submit_urb failed with result: %d\n", |
115 | __func__, retval); | ||
115 | } | 116 | } |
116 | 117 | ||
117 | /* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */ | 118 | /* Decide if we need to issue a control message and do so. Must be called with pm->lock taken */ |