openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: iforce: 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>
This commit is contained in:
Greg Kroah-Hartman 2012-04-25 14:34:49 -07:00
parent 9451df0ee8
commit 7b22a8855a
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/input/joystick/iforce/iforce-main.c
View File

@ -317,7 +317,8 @@ int iforce_init_device(struct iforce *iforce)
break;
if (i == 20) { /* 5 seconds */
err("Timeout waiting for response from device.");
dev_err(&input_dev->dev,
"Timeout waiting for response from device.\n");
error = -ENODEV;
goto fail;
}

10
drivers/input/joystick/iforce/iforce-packets.c
View File

@ -257,7 +257,8 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC);
if (status) {
err("usb_submit_urb failed %d", status);
dev_err(&iforce->usbdev->dev,
"usb_submit_urb failed %d\n", status);
return -1;
}
@ -289,12 +290,15 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet)
return -1;
}
#else
err("iforce_get_id_packet: iforce->bus = SERIO!");
dev_err(&iforce->dev->dev,
"iforce_get_id_packet: iforce->bus = SERIO!\n");
#endif
break;
default:
err("iforce_get_id_packet: iforce->bus = %d", iforce->bus);
dev_err(&iforce->dev->dev,
"iforce_get_id_packet: iforce->bus = %d\n",
iforce->bus);
break;
}

5
drivers/input/joystick/iforce/iforce-usb.c
View File

@ -100,8 +100,9 @@ static void iforce_usb_irq(struct urb *urb)
exit:
status = usb_submit_urb (urb, GFP_ATOMIC);
if (status)
err ("%s - usb_submit_urb failed with result %d",
__func__, status);
dev_err(&iforce->usbdev->dev,
"%s - usb_submit_urb failed with result %d\n",
__func__, status);
}
static void iforce_usb_out(struct urb *urb)