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: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 64262a9a882901a3f7052cc714a202a4c9ee51c0..d8d7377b5fb8c739d8973a19ea8f69ed58a6fda4 100644 (file)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -342,8 +342,8 @@ static int usb_probe_interface(struct device *dev)
        if (driver->disable_hub_initiated_lpm) {
                lpm_disable_error = usb_unlocked_disable_lpm(udev);
                if (lpm_disable_error) {
-                       dev_err(&intf->dev, "%s Failed to disable LPM for driver %s\n.",
-                                       __func__, driver->name);
+                       dev_err(&intf->dev, "%s Failed to disable LPM for driver %s\n",
+                               __func__, driver->name);
                        error = lpm_disable_error;
                        goto err;
                }
@@ -537,8 +537,8 @@ int usb_driver_claim_interface(struct usb_driver *driver,
        if (driver->disable_hub_initiated_lpm) {
                lpm_disable_error = usb_unlocked_disable_lpm(udev);
                if (lpm_disable_error) {
-                       dev_err(&iface->dev, "%s Failed to disable LPM for driver %s\n.",
-                                       __func__, driver->name);
+                       dev_err(&iface->dev, "%s Failed to disable LPM for driver %s\n",
+                               __func__, driver->name);
                        return -ENOMEM;
                }
        }

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 7ccdd3d4db84c9d4675084d4a575f458fd1e1d44..916bcd539afac164dc955a590864764715430c0d 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -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,
                                                &hub->tt, GFP_NOIO);
                                if (ret < 0) {
-                                       dev_err(hub->intfdev, "Host not "
-                                                       "accepting hub info "
-                                                       "update.\n");
-                                       dev_err(hub->intfdev, "LS/FS devices "
-                                                       "and hubs may not work "
-                                                       "under this hub\n.");
+                                       dev_err(hub->intfdev,
+                                               "Host not accepting hub info update\n");
+                                       dev_err(hub->intfdev,
+                                               "LS/FS devices and hubs may not work under this hub\n");
                                }
                        }
                        hub_power_on(hub, true);
@@ -3157,7 +3155,7 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
                usb_set_usb2_hardware_lpm(udev, 0);
 
        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;
                if (PMSG_IS_AUTO(msg))
                        goto err_ltm;
@@ -5475,13 +5473,12 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
         */
        ret = usb_unlocked_disable_lpm(udev);
        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;
        }
        ret = usb_disable_ltm(udev);
        if (ret) {
-               dev_err(&udev->dev, "%s Failed to disable LTM\n.",
-                               __func__);
+               dev_err(&udev->dev, "%s Failed to disable LTM\n", __func__);
                goto re_enumerate_no_bos;
        }
 

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index f836bae1e4859fa8e0b18ea393e7526ca9ae9b81..dac4adeec21392487fd01cc364055a54b6efd1c2 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -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.
         */
        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);
                return -ENOMEM;
        }
@@ -1500,7 +1500,7 @@ int usb_reset_configuration(struct usb_device *dev)
         * that the xHCI driver can recalculate the U1/U2 timeouts.
         */
        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);
                return -ENOMEM;
        }
@@ -1848,7 +1848,7 @@ free_interfaces:
         * timeouts.
         */
        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);
                ret = -ENOMEM;
                goto free_interfaces;