Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 288c0f44 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

xhci: make error messages grepable



grep must work, not matter the line length.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f4f8ae05
Loading
Loading
Loading
Loading
+18 −18
Original line number Original line Diff line number Diff line
@@ -1804,15 +1804,15 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
		ret = -ETIME;
		ret = -ETIME;
		break;
		break;
	case COMP_ENOMEM:
	case COMP_ENOMEM:
		dev_warn(&udev->dev, "Not enough host controller resources "
		dev_warn(&udev->dev,
				"for new device state.\n");
			 "Not enough host controller resources for new device state.\n");
		ret = -ENOMEM;
		ret = -ENOMEM;
		/* FIXME: can we allocate more resources for the HC? */
		/* FIXME: can we allocate more resources for the HC? */
		break;
		break;
	case COMP_BW_ERR:
	case COMP_BW_ERR:
	case COMP_2ND_BW_ERR:
	case COMP_2ND_BW_ERR:
		dev_warn(&udev->dev, "Not enough bandwidth "
		dev_warn(&udev->dev,
				"for new device state.\n");
			 "Not enough bandwidth for new device state.\n");
		ret = -ENOSPC;
		ret = -ENOSPC;
		/* FIXME: can we go back to the old state? */
		/* FIXME: can we go back to the old state? */
		break;
		break;
@@ -1824,8 +1824,8 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
		ret = -EINVAL;
		ret = -EINVAL;
		break;
		break;
	case COMP_DEV_ERR:
	case COMP_DEV_ERR:
		dev_warn(&udev->dev, "ERROR: Incompatible device for endpoint "
		dev_warn(&udev->dev,
				"configure command.\n");
			 "ERROR: Incompatible device for endpoint configure command.\n");
		ret = -ENODEV;
		ret = -ENODEV;
		break;
		break;
	case COMP_SUCCESS:
	case COMP_SUCCESS:
@@ -1834,8 +1834,8 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
		ret = 0;
		ret = 0;
		break;
		break;
	default:
	default:
		xhci_err(xhci, "ERROR: unexpected command completion "
		xhci_err(xhci, "ERROR: unexpected command completion code 0x%x.\n",
				"code 0x%x.\n", *cmd_status);
				*cmd_status);
		ret = -EINVAL;
		ret = -EINVAL;
		break;
		break;
	}
	}
@@ -1855,24 +1855,24 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
		ret = -ETIME;
		ret = -ETIME;
		break;
		break;
	case COMP_EINVAL:
	case COMP_EINVAL:
		dev_warn(&udev->dev, "WARN: xHCI driver setup invalid evaluate "
		dev_warn(&udev->dev,
				"context command.\n");
			 "WARN: xHCI driver setup invalid evaluate context command.\n");
		ret = -EINVAL;
		ret = -EINVAL;
		break;
		break;
	case COMP_EBADSLT:
	case COMP_EBADSLT:
		dev_warn(&udev->dev, "WARN: slot not enabled for"
		dev_warn(&udev->dev,
				"evaluate context command.\n");
			"WARN: slot not enabled for evaluate context command.\n");
		ret = -EINVAL;
		ret = -EINVAL;
		break;
		break;
	case COMP_CTX_STATE:
	case COMP_CTX_STATE:
		dev_warn(&udev->dev, "WARN: invalid context state for "
		dev_warn(&udev->dev,
				"evaluate context command.\n");
			"WARN: invalid context state for evaluate context command.\n");
		xhci_dbg_ctx(xhci, virt_dev->out_ctx, 1);
		xhci_dbg_ctx(xhci, virt_dev->out_ctx, 1);
		ret = -EINVAL;
		ret = -EINVAL;
		break;
		break;
	case COMP_DEV_ERR:
	case COMP_DEV_ERR:
		dev_warn(&udev->dev, "ERROR: Incompatible device for evaluate "
		dev_warn(&udev->dev,
				"context command.\n");
			"ERROR: Incompatible device for evaluate context command.\n");
		ret = -ENODEV;
		ret = -ENODEV;
		break;
		break;
	case COMP_MEL_ERR:
	case COMP_MEL_ERR:
@@ -1886,8 +1886,8 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
		ret = 0;
		ret = 0;
		break;
		break;
	default:
	default:
		xhci_err(xhci, "ERROR: unexpected command completion "
		xhci_err(xhci, "ERROR: unexpected command completion code 0x%x.\n",
				"code 0x%x.\n", *cmd_status);
			*cmd_status);
		ret = -EINVAL;
		ret = -EINVAL;
		break;
		break;
	}
	}