diff options
author | Oliver Neukum <oneukum@suse.de> | 2014-06-02 09:25:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 18:45:42 -0400 |
commit | 288c0f44eb5535fe367ac70c5772b5f0404bf74f (patch) | |
tree | 76e5c33d8f5c4f3d4be6f1b43b146b89fee9854e /drivers/usb/host | |
parent | f4f8ae0568abf9389cccb2d7be796955b60f891c (diff) |
xhci: make error messages grepable
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>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/xhci.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index b04fef1e4ff8..0342d9b63977 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
@@ -1804,15 +1804,15 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci, | |||
1804 | ret = -ETIME; | 1804 | ret = -ETIME; |
1805 | break; | 1805 | break; |
1806 | case COMP_ENOMEM: | 1806 | case COMP_ENOMEM: |
1807 | dev_warn(&udev->dev, "Not enough host controller resources " | 1807 | dev_warn(&udev->dev, |
1808 | "for new device state.\n"); | 1808 | "Not enough host controller resources for new device state.\n"); |
1809 | ret = -ENOMEM; | 1809 | ret = -ENOMEM; |
1810 | /* FIXME: can we allocate more resources for the HC? */ | 1810 | /* FIXME: can we allocate more resources for the HC? */ |
1811 | break; | 1811 | break; |
1812 | case COMP_BW_ERR: | 1812 | case COMP_BW_ERR: |
1813 | case COMP_2ND_BW_ERR: | 1813 | case COMP_2ND_BW_ERR: |
1814 | dev_warn(&udev->dev, "Not enough bandwidth " | 1814 | dev_warn(&udev->dev, |
1815 | "for new device state.\n"); | 1815 | "Not enough bandwidth for new device state.\n"); |
1816 | ret = -ENOSPC; | 1816 | ret = -ENOSPC; |
1817 | /* FIXME: can we go back to the old state? */ | 1817 | /* FIXME: can we go back to the old state? */ |
1818 | break; | 1818 | break; |
@@ -1824,8 +1824,8 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci, | |||
1824 | ret = -EINVAL; | 1824 | ret = -EINVAL; |
1825 | break; | 1825 | break; |
1826 | case COMP_DEV_ERR: | 1826 | case COMP_DEV_ERR: |
1827 | dev_warn(&udev->dev, "ERROR: Incompatible device for endpoint " | 1827 | dev_warn(&udev->dev, |
1828 | "configure command.\n"); | 1828 | "ERROR: Incompatible device for endpoint configure command.\n"); |
1829 | ret = -ENODEV; | 1829 | ret = -ENODEV; |
1830 | break; | 1830 | break; |
1831 | case COMP_SUCCESS: | 1831 | case COMP_SUCCESS: |
@@ -1834,8 +1834,8 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci, | |||
1834 | ret = 0; | 1834 | ret = 0; |
1835 | break; | 1835 | break; |
1836 | default: | 1836 | default: |
1837 | xhci_err(xhci, "ERROR: unexpected command completion " | 1837 | xhci_err(xhci, "ERROR: unexpected command completion code 0x%x.\n", |
1838 | "code 0x%x.\n", *cmd_status); | 1838 | *cmd_status); |
1839 | ret = -EINVAL; | 1839 | ret = -EINVAL; |
1840 | break; | 1840 | break; |
1841 | } | 1841 | } |
@@ -1855,24 +1855,24 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci, | |||
1855 | ret = -ETIME; | 1855 | ret = -ETIME; |
1856 | break; | 1856 | break; |
1857 | case COMP_EINVAL: | 1857 | case COMP_EINVAL: |
1858 | dev_warn(&udev->dev, "WARN: xHCI driver setup invalid evaluate " | 1858 | dev_warn(&udev->dev, |
1859 | "context command.\n"); | 1859 | "WARN: xHCI driver setup invalid evaluate context command.\n"); |
1860 | ret = -EINVAL; | 1860 | ret = -EINVAL; |
1861 | break; | 1861 | break; |
1862 | case COMP_EBADSLT: | 1862 | case COMP_EBADSLT: |
1863 | dev_warn(&udev->dev, "WARN: slot not enabled for" | 1863 | dev_warn(&udev->dev, |
1864 | "evaluate context command.\n"); | 1864 | "WARN: slot not enabled for evaluate context command.\n"); |
1865 | ret = -EINVAL; | 1865 | ret = -EINVAL; |
1866 | break; | 1866 | break; |
1867 | case COMP_CTX_STATE: | 1867 | case COMP_CTX_STATE: |
1868 | dev_warn(&udev->dev, "WARN: invalid context state for " | 1868 | dev_warn(&udev->dev, |
1869 | "evaluate context command.\n"); | 1869 | "WARN: invalid context state for evaluate context command.\n"); |
1870 | xhci_dbg_ctx(xhci, virt_dev->out_ctx, 1); | 1870 | xhci_dbg_ctx(xhci, virt_dev->out_ctx, 1); |
1871 | ret = -EINVAL; | 1871 | ret = -EINVAL; |
1872 | break; | 1872 | break; |
1873 | case COMP_DEV_ERR: | 1873 | case COMP_DEV_ERR: |
1874 | dev_warn(&udev->dev, "ERROR: Incompatible device for evaluate " | 1874 | dev_warn(&udev->dev, |
1875 | "context command.\n"); | 1875 | "ERROR: Incompatible device for evaluate context command.\n"); |
1876 | ret = -ENODEV; | 1876 | ret = -ENODEV; |
1877 | break; | 1877 | break; |
1878 | case COMP_MEL_ERR: | 1878 | case COMP_MEL_ERR: |
@@ -1886,8 +1886,8 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci, | |||
1886 | ret = 0; | 1886 | ret = 0; |
1887 | break; | 1887 | break; |
1888 | default: | 1888 | default: |
1889 | xhci_err(xhci, "ERROR: unexpected command completion " | 1889 | xhci_err(xhci, "ERROR: unexpected command completion code 0x%x.\n", |
1890 | "code 0x%x.\n", *cmd_status); | 1890 | *cmd_status); |
1891 | ret = -EINVAL; | 1891 | ret = -EINVAL; |
1892 | break; | 1892 | break; |
1893 | } | 1893 | } |