PCI: Merge multi-line quoted strings

Merge quoted strings that are broken across lines into a single entity.
The compiler merges them anyway, but checkpatch complains about it, and
merging them makes it easier to grep for strings.

No functional change.

[bhelgaas: changelog, do the same for everything under drivers/pci]
Signed-off-by: Ryan Desfosses <ryan@desfo.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 5794057f7ec1..f7b8684a7739 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -1045,8 +1045,7 @@ static int enable_slot(struct hotplug_slot *hs)
         rc = check_limitations(slot_cur);
         if (rc) {
                 err("Adding this card exceeds the limitations of this bus.\n");
-                err("(i.e., >1 133MHz cards running on same bus, or "
-                     ">2 66 PCI cards running on same bus.\n");
+                err("(i.e., >1 133MHz cards running on same bus, or >2 66 PCI cards running on same bus.\n");
                 err("Try hot-adding into another bus\n");
                 rc = -EINVAL;
                 goto error_nopower;
@@ -1070,12 +1069,10 @@ static int enable_slot(struct hotplug_slot *hs)
                                         !(SLOT_PWRGD(slot_cur->status)))
                         err("power fault occurred trying to power up\n");
                 else if (SLOT_BUS_SPEED(slot_cur->status)) {
-                        err("bus speed mismatch occurred.  please check "
-                                "current bus speed and card capability\n");
+                        err("bus speed mismatch occurred.  please check current bus speed and card capability\n");
                         print_card_capability(slot_cur);
                 } else if (SLOT_BUS_MODE(slot_cur->ext_status)) {
-                        err("bus mode mismatch occurred.  please check "
-                                "current bus mode and card capability\n");
+                        err("bus mode mismatch occurred.  please check current bus mode and card capability\n");
                         print_card_capability(slot_cur);
                 }
                 ibmphp_update_slot_info(slot_cur);
@@ -1098,8 +1095,7 @@ static int enable_slot(struct hotplug_slot *hs)
                 goto error_power;
         }
         if (SLOT_POWER(slot_cur->status) && (SLOT_BUS_SPEED(slot_cur->status))) {
-                err("bus speed mismatch occurred.  please check current bus "
-                                        "speed and card capability\n");
+                err("bus speed mismatch occurred.  please check current bus speed and card capability\n");
                 print_card_capability(slot_cur);
                 goto error_power;
         }