Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: idmouse.c: remove err() usage

Browse source 
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>
This commit is contained in:
Greg Kroah-Hartman 2012-04-20 16:53:42 -07:00
parent e9a527dae3
commit ef1ffb7296
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/misc/idmouse.c
View file

@ -366,14 +366,14 @@ static int idmouse_probe(struct usb_interface *interface,
kmalloc(IMGSIZE + dev->bulk_in_size, GFP_KERNEL); kmalloc(IMGSIZE + dev->bulk_in_size, GFP_KERNEL);
if (!dev->bulk_in_buffer) { if (!dev->bulk_in_buffer) {
err("Unable to allocate input buffer."); dev_err(&interface->dev, "Unable to allocate input buffer.\n");
idmouse_delete(dev); idmouse_delete(dev);
return -ENOMEM; return -ENOMEM;
} }
} }
if (!(dev->bulk_in_endpointAddr)) { if (!(dev->bulk_in_endpointAddr)) {
err("Unable to find bulk-in endpoint."); dev_err(&interface->dev, "Unable to find bulk-in endpoint.\n");
idmouse_delete(dev); idmouse_delete(dev);
return -ENODEV; return -ENODEV;
} }
@ -385,7 +385,7 @@ static int idmouse_probe(struct usb_interface *interface,
result = usb_register_dev(interface, &idmouse_class); result = usb_register_dev(interface, &idmouse_class);
if (result) { if (result) {
/* something prevented us from registering this device */ /* something prevented us from registering this device */
err("Unble to allocate minor number."); dev_err(&interface->dev, "Unble to allocate minor number.\n");
usb_set_intfdata(interface, NULL); usb_set_intfdata(interface, NULL);
idmouse_delete(dev); idmouse_delete(dev);
return result; return result;