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, 12 insertions, 20 deletions

diff --git a/drivers/pci/hotplug/ibmphp_pci.c b/drivers/pci/hotplug/ibmphp_pci.c
index f53b7c5b9a3f..2fd296706ce7 100644
--- a/drivers/pci/hotplug/ibmphp_pci.c
+++ b/drivers/pci/hotplug/ibmphp_pci.c
@@ -137,8 +137,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
                                      "Please choose another device.\n", cur_func->device);
                                 return -ENODEV;
                         } else if (class == PCI_CLASS_DISPLAY_VGA) {
-                                err ("The device %x is not supported for hot plugging. "
-                                     "Please choose another device.\n", cur_func->device);
+                                err ("The device %x is not supported for hot plugging. Please choose another device.\n",
+                                     cur_func->device);
                                 return -ENODEV;
                         }
                         switch (hdr_type) {
@@ -179,8 +179,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
                                 case PCI_HEADER_TYPE_MULTIBRIDGE:
                                         class >>= 8;
                                         if (class != PCI_CLASS_BRIDGE_PCI) {
-                                                err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. "
-                                                     "Please insert another card.\n", cur_func->device);
+                                                err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging.  Please insert another card.\n",
+                                                     cur_func->device);
                                                 return -ENODEV;
                                         }
                                         assign_alt_irq (cur_func, class_code);
@@ -247,8 +247,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
                                         class >>= 8;
                                         debug ("class now is %x\n", class);
                                         if (class != PCI_CLASS_BRIDGE_PCI) {
-                                                err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. "
-                                                     "Please insert another card.\n", cur_func->device);
+                                                err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging.  Please insert another card.\n",
+                                                     cur_func->device);
                                                 return -ENODEV;
                                         }
 
@@ -1125,13 +1125,11 @@ static struct res_needed *scan_behind_bridge (struct pci_func *func, u8 busno)
 
                                 class >>= 8;    /* to take revision out, class = class.subclass.prog i/f */
                                 if (class == PCI_CLASS_NOT_DEFINED_VGA) {
-                                        err ("The device %x is VGA compatible and as is not supported for hot plugging. "
-                                             "Please choose another device.\n", device);
+                                        err ("The device %x is VGA compatible and as is not supported for hot plugging.  Please choose another device.\n", device);
                                         amount->not_correct = 1;
                                         return amount;
                                 } else if (class == PCI_CLASS_DISPLAY_VGA) {
-                                        err ("The device %x is not supported for hot plugging. "
-                                             "Please choose another device.\n", device);
+                                        err ("The device %x is not supported for hot plugging.  Please choose another device.\n", device);
                                         amount->not_correct = 1;
                                         return amount;
                                 }
@@ -1483,12 +1481,10 @@ static int unconfigure_boot_card (struct slot *slot_cur)
                         debug ("hdr_type %x, class %x\n", hdr_type, class);
                         class >>= 8;    /* to take revision out, class = class.subclass.prog i/f */
                         if (class == PCI_CLASS_NOT_DEFINED_VGA) {
-                                err ("The device %x function %x is VGA compatible and is not supported for hot removing. "
-                                     "Please choose another device.\n", device, function);
+                                err ("The device %x function %x is VGA compatible and is not supported for hot removing.  Please choose another device.\n", device, function);
                                 return -ENODEV;
                         } else if (class == PCI_CLASS_DISPLAY_VGA) {
-                                err ("The device %x function %x is not supported for hot removing. "
-                                     "Please choose another device.\n", device, function);
+                                err ("The device %x function %x is not supported for hot removing.  Please choose another device.\n", device, function);
                                 return -ENODEV;
                         }
 
@@ -1513,9 +1509,7 @@ static int unconfigure_boot_card (struct slot *slot_cur)
                                 case PCI_HEADER_TYPE_BRIDGE:
                                         class >>= 8;
                                         if (class != PCI_CLASS_BRIDGE_PCI) {
-                                                err ("This device %x function %x is not PCI-to-PCI bridge, "
-                                                     "and is not supported for hot-removing. "
-                                                     "Please try another card.\n", device, function);
+                                                err ("This device %x function %x is not PCI-to-PCI bridge, and is not supported for hot-removing.  Please try another card.\n", device, function);
                                                 return -ENODEV;
                                         }
                                         rc = unconfigure_boot_bridge (busno, device, function);
@@ -1529,9 +1523,7 @@ static int unconfigure_boot_card (struct slot *slot_cur)
                                 case PCI_HEADER_TYPE_MULTIBRIDGE:
                                         class >>= 8;
                                         if (class != PCI_CLASS_BRIDGE_PCI) {
-                                                err ("This device %x function %x is not PCI-to-PCI bridge, "
-                                                     "and is not supported for hot-removing. "
-                                                     "Please try another card.\n", device, function);
+                                                err ("This device %x function %x is not PCI-to-PCI bridge,  and is not supported for hot-removing.  Please try another card.\n", device, function);
                                                 return -ENODEV;
                                         }
                                         rc = unconfigure_boot_bridge (busno, device, function);