OSDN Git Service

xhci: make error messages grepable
authorOliver Neukum <oneukum@suse.de>
Mon, 2 Jun 2014 13:25:17 +0000 (15:25 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jul 2014 22:45:42 +0000 (15:45 -0700)
grep must work, not matter the line length.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci.c

index b04fef1..0342d9b 100644 (file)
@@ -1804,15 +1804,15 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
                ret = -ETIME;
                break;
        case COMP_ENOMEM:
-               dev_warn(&udev->dev, "Not enough host controller resources "
-                               "for new device state.\n");
+               dev_warn(&udev->dev,
+                        "Not enough host controller resources for new device state.\n");
                ret = -ENOMEM;
                /* FIXME: can we allocate more resources for the HC? */
                break;
        case COMP_BW_ERR:
        case COMP_2ND_BW_ERR:
-               dev_warn(&udev->dev, "Not enough bandwidth "
-                               "for new device state.\n");
+               dev_warn(&udev->dev,
+                        "Not enough bandwidth for new device state.\n");
                ret = -ENOSPC;
                /* FIXME: can we go back to the old state? */
                break;
@@ -1824,8 +1824,8 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
                ret = -EINVAL;
                break;
        case COMP_DEV_ERR:
-               dev_warn(&udev->dev, "ERROR: Incompatible device for endpoint "
-                               "configure command.\n");
+               dev_warn(&udev->dev,
+                        "ERROR: Incompatible device for endpoint configure command.\n");
                ret = -ENODEV;
                break;
        case COMP_SUCCESS:
@@ -1834,8 +1834,8 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
                ret = 0;
                break;
        default:
-               xhci_err(xhci, "ERROR: unexpected command completion "
-                               "code 0x%x.\n", *cmd_status);
+               xhci_err(xhci, "ERROR: unexpected command completion code 0x%x.\n",
+                               *cmd_status);
                ret = -EINVAL;
                break;
        }
@@ -1855,24 +1855,24 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
                ret = -ETIME;
                break;
        case COMP_EINVAL:
-               dev_warn(&udev->dev, "WARN: xHCI driver setup invalid evaluate "
-                               "context command.\n");
+               dev_warn(&udev->dev,
+                        "WARN: xHCI driver setup invalid evaluate context command.\n");
                ret = -EINVAL;
                break;
        case COMP_EBADSLT:
-               dev_warn(&udev->dev, "WARN: slot not enabled for"
-                               "evaluate context command.\n");
+               dev_warn(&udev->dev,
+                       "WARN: slot not enabled for evaluate context command.\n");
                ret = -EINVAL;
                break;
        case COMP_CTX_STATE:
-               dev_warn(&udev->dev, "WARN: invalid context state for "
-                               "evaluate context command.\n");
+               dev_warn(&udev->dev,
+                       "WARN: invalid context state for evaluate context command.\n");
                xhci_dbg_ctx(xhci, virt_dev->out_ctx, 1);
                ret = -EINVAL;
                break;
        case COMP_DEV_ERR:
-               dev_warn(&udev->dev, "ERROR: Incompatible device for evaluate "
-                               "context command.\n");
+               dev_warn(&udev->dev,
+                       "ERROR: Incompatible device for evaluate context command.\n");
                ret = -ENODEV;
                break;
        case COMP_MEL_ERR:
@@ -1886,8 +1886,8 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
                ret = 0;
                break;
        default:
-               xhci_err(xhci, "ERROR: unexpected command completion "
-                               "code 0x%x.\n", *cmd_status);
+               xhci_err(xhci, "ERROR: unexpected command completion code 0x%x.\n",
+                       *cmd_status);
                ret = -EINVAL;
                break;
        }