2013-07-17 02:26:02

by Joe Perches

Subject: [PATCH] xhci: Correct misplaced newlines

Logging messages end in newlines, not have
them put in the middle of messages.

Signed-off-by: Joe Perches <[email protected]>
---
drivers/usb/host/xhci.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 2c49f00..87b5e65 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -3075,8 +3075,8 @@ static u32 xhci_calculate_no_streams_bitmask(struct xhci_hcd *xhci,
/* Are streams already being freed for the endpoint? */
if (ep_state & EP_GETTING_NO_STREAMS) {
xhci_warn(xhci, "WARN Can't disable streams for "
- "endpoint 0x%x\n, "
- "streams are being disabled already.",
+ "endpoint 0x%x, "
+ "streams are being disabled already\n",
eps[i]->desc.bEndpointAddress);
return 0;
}
@@ -3084,8 +3084,8 @@ static u32 xhci_calculate_no_streams_bitmask(struct xhci_hcd *xhci,
if (!(ep_state & EP_HAS_STREAMS) &&
!(ep_state & EP_GETTING_STREAMS)) {
xhci_warn(xhci, "WARN Can't disable streams for "
- "endpoint 0x%x\n, "
- "streams are already disabled!",
+ "endpoint 0x%x, "
+ "streams are already disabled!\n",
eps[i]->desc.bEndpointAddress);
xhci_warn(xhci, "WARN xhci_free_streams() called "
"with non-streams endpoint\n");
@@ -4353,7 +4353,7 @@ static u16 xhci_get_timeout_no_hub_lpm(struct usb_device *udev,
state_name, sel);
else
dev_dbg(&udev->dev, "Device-initiated %s disabled "
- "due to long PEL %llu\n ms",
+ "due to long PEL %llu ms\n",
state_name, pel);
return USB3_LPM_DISABLED;
}

2013-07-17 04:34:20

by Sarah Sharp

Subject: Re: [PATCH] xhci: Correct misplaced newlines

Thanks Joe, I'll apply this to my tree after the merge window closes.

Sarah Sharp

On Tue, Jul 16, 2013 at 07:25:59PM -0700, Joe Perches wrote:
> Logging messages end in newlines, not have
> them put in the middle of messages.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/usb/host/xhci.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
> index 2c49f00..87b5e65 100644
> --- a/drivers/usb/host/xhci.c
> +++ b/drivers/usb/host/xhci.c
> @@ -3075,8 +3075,8 @@ static u32 xhci_calculate_no_streams_bitmask(struct xhci_hcd *xhci,
> /* Are streams already being freed for the endpoint? */
> if (ep_state & EP_GETTING_NO_STREAMS) {
> xhci_warn(xhci, "WARN Can't disable streams for "
> - "endpoint 0x%x\n, "
> - "streams are being disabled already.",
> + "endpoint 0x%x, "
> + "streams are being disabled already\n",
> eps[i]->desc.bEndpointAddress);
> return 0;
> }
> @@ -3084,8 +3084,8 @@ static u32 xhci_calculate_no_streams_bitmask(struct xhci_hcd *xhci,
> if (!(ep_state & EP_HAS_STREAMS) &&
> !(ep_state & EP_GETTING_STREAMS)) {
> xhci_warn(xhci, "WARN Can't disable streams for "
> - "endpoint 0x%x\n, "
> - "streams are already disabled!",
> + "endpoint 0x%x, "
> + "streams are already disabled!\n",
> eps[i]->desc.bEndpointAddress);
> xhci_warn(xhci, "WARN xhci_free_streams() called "
> "with non-streams endpoint\n");
> @@ -4353,7 +4353,7 @@ static u16 xhci_get_timeout_no_hub_lpm(struct usb_device *udev,
> state_name, sel);
> else
> dev_dbg(&udev->dev, "Device-initiated %s disabled "
> - "due to long PEL %llu\n ms",
> + "due to long PEL %llu ms\n",
> state_name, pel);
> return USB3_LPM_DISABLED;
> }
>
>