Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 02:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: octeon-usb: eliminate cvmx_dprintf() usage

Browse Source 
Eliminate cvmx_dprintf() usage and use dev_err() instead.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2014-11-07 23:43:34 +02:00 committed by Greg Kroah-Hartman
parent 2e6ac45c4a
commit ba0b8e420a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/octeon-usb/octeon-hcd.c
View File

@ -1512,6 +1512,9 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb,
int channel, int channel,
struct cvmx_usb_pipe *pipe) struct cvmx_usb_pipe *pipe)
{ {
struct octeon_hcd *priv = cvmx_usb_to_octeon(usb);
struct usb_hcd *hcd = octeon_to_hcd(priv);
struct device *dev = hcd->self.controller;
struct cvmx_usb_transaction *transaction = struct cvmx_usb_transaction *transaction =
list_first_entry(&pipe->transactions, typeof(*transaction), list_first_entry(&pipe->transactions, typeof(*transaction),
node); node);
@ -1528,7 +1531,7 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb,
switch (transaction->stage) { switch (transaction->stage) {
case CVMX_USB_STAGE_NON_CONTROL: case CVMX_USB_STAGE_NON_CONTROL:
case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE: case CVMX_USB_STAGE_NON_CONTROL_SPLIT_COMPLETE:
cvmx_dprintf("%s: ERROR - Non control stage\n", __func__); dev_err(dev, "%s: ERROR - Non control stage\n", __func__);
break; break;
case CVMX_USB_STAGE_SETUP: case CVMX_USB_STAGE_SETUP:
usbc_hctsiz.s.pid = 3; /* Setup */ usbc_hctsiz.s.pid = 3; /* Setup */
@ -2585,6 +2588,9 @@ static int cvmx_usb_get_frame_number(struct cvmx_usb_state *usb)
*/ */
static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel)
{ {
struct octeon_hcd *priv = cvmx_usb_to_octeon(usb);
struct usb_hcd *hcd = octeon_to_hcd(priv);
struct device *dev = hcd->self.controller;
union cvmx_usbcx_hcintx usbc_hcint; union cvmx_usbcx_hcintx usbc_hcint;
union cvmx_usbcx_hctsizx usbc_hctsiz; union cvmx_usbcx_hctsizx usbc_hctsiz;
union cvmx_usbcx_hccharx usbc_hcchar; union cvmx_usbcx_hccharx usbc_hcchar;
@ -2642,8 +2648,8 @@ static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel)
* Channel halt isn't needed. * Channel halt isn't needed.
*/ */
} else { } else {
cvmx_dprintf("USB%d: Channel %d interrupt without halt\n", dev_err(dev, "USB%d: Channel %d interrupt without halt\n",
usb->index, channel); usb->index, channel);
return 0; return 0;
} }
} }