Commit 1ccc417e authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

usb: core: Fix logging messages with spurious periods after newlines

Using a period after a newline causes bad output.

Miscellanea:

o Coalesce formats too
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7739376e
...@@ -342,8 +342,8 @@ static int usb_probe_interface(struct device *dev) ...@@ -342,8 +342,8 @@ static int usb_probe_interface(struct device *dev)
if (driver->disable_hub_initiated_lpm) { if (driver->disable_hub_initiated_lpm) {
lpm_disable_error = usb_unlocked_disable_lpm(udev); lpm_disable_error = usb_unlocked_disable_lpm(udev);
if (lpm_disable_error) { if (lpm_disable_error) {
dev_err(&intf->dev, "%s Failed to disable LPM for driver %s\n.", dev_err(&intf->dev, "%s Failed to disable LPM for driver %s\n",
__func__, driver->name); __func__, driver->name);
error = lpm_disable_error; error = lpm_disable_error;
goto err; goto err;
} }
...@@ -537,8 +537,8 @@ int usb_driver_claim_interface(struct usb_driver *driver, ...@@ -537,8 +537,8 @@ int usb_driver_claim_interface(struct usb_driver *driver,
if (driver->disable_hub_initiated_lpm) { if (driver->disable_hub_initiated_lpm) {
lpm_disable_error = usb_unlocked_disable_lpm(udev); lpm_disable_error = usb_unlocked_disable_lpm(udev);
if (lpm_disable_error) { if (lpm_disable_error) {
dev_err(&iface->dev, "%s Failed to disable LPM for driver %s\n.", dev_err(&iface->dev, "%s Failed to disable LPM for driver %s\n",
__func__, driver->name); __func__, driver->name);
return -ENOMEM; return -ENOMEM;
} }
} }
......
...@@ -1049,12 +1049,10 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type) ...@@ -1049,12 +1049,10 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
ret = hcd->driver->update_hub_device(hcd, hdev, ret = hcd->driver->update_hub_device(hcd, hdev,
&hub->tt, GFP_NOIO); &hub->tt, GFP_NOIO);
if (ret < 0) { if (ret < 0) {
dev_err(hub->intfdev, "Host not " dev_err(hub->intfdev,
"accepting hub info " "Host not accepting hub info update\n");
"update.\n"); dev_err(hub->intfdev,
dev_err(hub->intfdev, "LS/FS devices " "LS/FS devices and hubs may not work under this hub\n");
"and hubs may not work "
"under this hub\n.");
} }
} }
hub_power_on(hub, true); hub_power_on(hub, true);
...@@ -3157,7 +3155,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg) ...@@ -3157,7 +3155,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
usb_set_usb2_hardware_lpm(udev, 0); usb_set_usb2_hardware_lpm(udev, 0);
if (usb_disable_ltm(udev)) { if (usb_disable_ltm(udev)) {
dev_err(&udev->dev, "Failed to disable LTM before suspend\n."); dev_err(&udev->dev, "Failed to disable LTM before suspend\n");
status = -ENOMEM; status = -ENOMEM;
if (PMSG_IS_AUTO(msg)) if (PMSG_IS_AUTO(msg))
goto err_ltm; goto err_ltm;
...@@ -5475,13 +5473,12 @@ static int usb_reset_and_verify_device(struct usb_device *udev) ...@@ -5475,13 +5473,12 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
*/ */
ret = usb_unlocked_disable_lpm(udev); ret = usb_unlocked_disable_lpm(udev);
if (ret) { if (ret) {
dev_err(&udev->dev, "%s Failed to disable LPM\n.", __func__); dev_err(&udev->dev, "%s Failed to disable LPM\n", __func__);
goto re_enumerate_no_bos; goto re_enumerate_no_bos;
} }
ret = usb_disable_ltm(udev); ret = usb_disable_ltm(udev);
if (ret) { if (ret) {
dev_err(&udev->dev, "%s Failed to disable LTM\n.", dev_err(&udev->dev, "%s Failed to disable LTM\n", __func__);
__func__);
goto re_enumerate_no_bos; goto re_enumerate_no_bos;
} }
......
...@@ -1356,7 +1356,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate) ...@@ -1356,7 +1356,7 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
* so that the xHCI driver can recalculate the U1/U2 timeouts. * so that the xHCI driver can recalculate the U1/U2 timeouts.
*/ */
if (usb_disable_lpm(dev)) { if (usb_disable_lpm(dev)) {
dev_err(&iface->dev, "%s Failed to disable LPM\n.", __func__); dev_err(&iface->dev, "%s Failed to disable LPM\n", __func__);
mutex_unlock(hcd->bandwidth_mutex); mutex_unlock(hcd->bandwidth_mutex);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1500,7 +1500,7 @@ int usb_reset_configuration(struct usb_device *dev) ...@@ -1500,7 +1500,7 @@ int usb_reset_configuration(struct usb_device *dev)
* that the xHCI driver can recalculate the U1/U2 timeouts. * that the xHCI driver can recalculate the U1/U2 timeouts.
*/ */
if (usb_disable_lpm(dev)) { if (usb_disable_lpm(dev)) {
dev_err(&dev->dev, "%s Failed to disable LPM\n.", __func__); dev_err(&dev->dev, "%s Failed to disable LPM\n", __func__);
mutex_unlock(hcd->bandwidth_mutex); mutex_unlock(hcd->bandwidth_mutex);
return -ENOMEM; return -ENOMEM;
} }
...@@ -1848,7 +1848,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration) ...@@ -1848,7 +1848,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
* timeouts. * timeouts.
*/ */
if (dev->actconfig && usb_disable_lpm(dev)) { if (dev->actconfig && usb_disable_lpm(dev)) {
dev_err(&dev->dev, "%s Failed to disable LPM\n.", __func__); dev_err(&dev->dev, "%s Failed to disable LPM\n", __func__);
mutex_unlock(hcd->bandwidth_mutex); mutex_unlock(hcd->bandwidth_mutex);
ret = -ENOMEM; ret = -ENOMEM;
goto free_interfaces; goto free_interfaces;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment