diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-20 19:53:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-20 19:53:42 -0400 |
commit | ef1ffb7296a19958b7575b382b7b0343bd441646 (patch) | |
tree | 0c6106725239840d05c8ef09efef1fc0a19e8df9 | |
parent | e9a527dae346c0ad56410c3794ba5ec535c66bcc (diff) |
USB: idmouse.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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
CC: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/misc/idmouse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index 0dee24698504..c00fcd74d39d 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c | |||
@@ -366,14 +366,14 @@ static int idmouse_probe(struct usb_interface *interface, | |||
366 | kmalloc(IMGSIZE + dev->bulk_in_size, GFP_KERNEL); | 366 | kmalloc(IMGSIZE + dev->bulk_in_size, GFP_KERNEL); |
367 | 367 | ||
368 | if (!dev->bulk_in_buffer) { | 368 | if (!dev->bulk_in_buffer) { |
369 | err("Unable to allocate input buffer."); | 369 | dev_err(&interface->dev, "Unable to allocate input buffer.\n"); |
370 | idmouse_delete(dev); | 370 | idmouse_delete(dev); |
371 | return -ENOMEM; | 371 | return -ENOMEM; |
372 | } | 372 | } |
373 | } | 373 | } |
374 | 374 | ||
375 | if (!(dev->bulk_in_endpointAddr)) { | 375 | if (!(dev->bulk_in_endpointAddr)) { |
376 | err("Unable to find bulk-in endpoint."); | 376 | dev_err(&interface->dev, "Unable to find bulk-in endpoint.\n"); |
377 | idmouse_delete(dev); | 377 | idmouse_delete(dev); |
378 | return -ENODEV; | 378 | return -ENODEV; |
379 | } | 379 | } |
@@ -385,7 +385,7 @@ static int idmouse_probe(struct usb_interface *interface, | |||
385 | result = usb_register_dev(interface, &idmouse_class); | 385 | result = usb_register_dev(interface, &idmouse_class); |
386 | if (result) { | 386 | if (result) { |
387 | /* something prevented us from registering this device */ | 387 | /* something prevented us from registering this device */ |
388 | err("Unble to allocate minor number."); | 388 | dev_err(&interface->dev, "Unble to allocate minor number.\n"); |
389 | usb_set_intfdata(interface, NULL); | 389 | usb_set_intfdata(interface, NULL); |
390 | idmouse_delete(dev); | 390 | idmouse_delete(dev); |
391 | return result; | 391 | return result; |