Commit ba0b8e42 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

staging: octeon-usb: eliminate cvmx_dprintf() usage 



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

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e6ac45c

drivers/staging/octeon-usb/octeon-hcd.c

+9 −3
Original line number Diff line number Diff line
@@ -1512,6 +1512,9 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb, 
					     int channel,

					     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 =

		list_first_entry(&pipe->transactions, typeof(*transaction),

				 node);
@@ -1528,7 +1531,7 @@ static void __cvmx_usb_start_channel_control(struct cvmx_usb_state *usb, 
	switch (transaction->stage) {

	case CVMX_USB_STAGE_NON_CONTROL:

	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;

	case CVMX_USB_STAGE_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)

{

	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_hctsizx usbc_hctsiz;

	union cvmx_usbcx_hccharx usbc_hcchar;
@@ -2642,7 +2648,7 @@ static int __cvmx_usb_poll_channel(struct cvmx_usb_state *usb, int channel) 
				 * Channel halt isn't needed.

				 */

			} 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);

				return 0;

			}