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>

28 files changed, 169 insertions, 249 deletions

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 8c148f39e8d7..d292d7cb3417 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -231,10 +231,7 @@ static int pci_vpd_pci22_wait(struct pci_dev *dev)
                 }
 
                 if (time_after(jiffies, timeout)) {
-                        dev_printk(KERN_DEBUG, &dev->dev,
-                                   "vpd r/w failed.  This is likely a firmware "
-                                   "bug on this device.  Contact the card "
-                                   "vendor for a firmware update.");
+                        dev_printk(KERN_DEBUG, &dev->dev, "vpd r/w failed.  This is likely a firmware bug on this device.  Contact the card vendor for a firmware update\n");
                         return -ETIMEDOUT;
                 }
                 if (fatal_signal_pending(current))
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 8e06124aa80f..f7d3de32c9a0 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -277,9 +277,8 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn,
         else if (size == 2)
                 *val = (*val >> (8 * (where & 2))) & 0xffff;
 
-        dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x "
-                "where=0x%04x size=%d val=0x%08lx\n", bus->number,
-                devfn, where, size, (unsigned long)*val);
+        dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n",
+                bus->number, devfn, where, size, (unsigned long)*val);
 
         return ret;
 }
@@ -302,9 +301,8 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn,
         if (ret != PCIBIOS_SUCCESSFUL)
                 return ret;
 
-        dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x "
-                "where=0x%04x size=%d val=0x%08lx\n", bus->number,
-                devfn, where, size, (unsigned long)val);
+        dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n",
+                bus->number, devfn, where, size, (unsigned long)val);
 
         if (size == 1) {
                 shift = 8 * (where & 3);
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 75e178330215..772d8766338a 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -351,11 +351,9 @@ static acpi_status acpiphp_add_context(acpi_handle handle, u32 lvl, void *data,
                         slot->slot = NULL;
                         bridge->nr_slots--;
                         if (retval == -EBUSY)
-                                pr_warn("Slot %llu already registered by another "
-                                        "hotplug driver\n", sun);
+                                pr_warn("Slot %llu already registered by another hotplug driver\n", sun);
                         else
-                                pr_warn("acpiphp_register_hotplug_slot failed "
-                                        "(err code = 0x%x)\n", retval);
+                                pr_warn("acpiphp_register_hotplug_slot failed (err code = 0x%x)\n", retval);
                 }
                 /* Even if the slot registration fails, we can still use it. */
         }
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index 868e62fc869b..4aaee746df88 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -706,8 +706,7 @@ static int ctrl_slot_setup(struct controller *ctrl,
                 hotplug_slot_info->adapter_status =
                         get_presence_status(ctrl, slot);
 
-                dbg("registering bus %d, dev %d, number %d, "
-                                "ctrl->slot_device_offset %d, slot %d\n",
+                dbg("registering bus %d, dev %d, number %d, ctrl->slot_device_offset %d, slot %d\n",
                                 slot->bus, slot->device,
                                 slot->number, ctrl->slot_device_offset,
                                 slot_number);
@@ -837,8 +836,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         bus = pdev->subordinate;
         if (!bus) {
-                dev_notice(&pdev->dev, "the device is not a bridge, "
-                                "skipping\n");
+                dev_notice(&pdev->dev, "the device is not a bridge, skipping\n");
                 rc = -ENODEV;
                 goto err_disable_device;
         }
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;
         }
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);
diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c
index f62dfc40f753..f34745abd5b6 100644
--- a/drivers/pci/hotplug/ibmphp_res.c
+++ b/drivers/pci/hotplug/ibmphp_res.c
@@ -789,8 +789,7 @@ int ibmphp_remove_resource (struct resource_node *res)
         bus_cur = find_bus_wprev (res->busno, NULL, 0);
 
         if (!bus_cur) {
-                err ("cannot find corresponding bus of the io resource to remove  "
-                        "bailing out...\n");
+                err ("cannot find corresponding bus of the io resource to remove  bailing out...\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 29caef96a21c..56d8486dc167 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -432,8 +432,7 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
         if ((slot->info == NULL) || (slot->ops == NULL))
                 return -EINVAL;
         if (slot->release == NULL) {
-                dbg("Why are you trying to register a hotplug slot "
-                    "without a proper release function?\n");
+                dbg("Why are you trying to register a hotplug slot without a proper release function?\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 96bb617e4de5..a2297db80813 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -266,8 +266,7 @@ static int pciehp_probe(struct pcie_device *dev)
         rc = init_slot(ctrl);
         if (rc) {
                 if (rc == -EBUSY)
-                        ctrl_warn(ctrl, "Slot already registered by another "
-                                  "hotplug driver\n");
+                        ctrl_warn(ctrl, "Slot already registered by another hotplug driver\n");
                 else
                         ctrl_err(ctrl, "Slot initialization failed\n");
                 goto err_out_release_ctlr;
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index c57463e1d756..ff32e85e1de6 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -376,14 +376,12 @@ static void handle_button_press_event(struct slot *p_slot)
                 pciehp_get_power_status(p_slot, &getstatus);
                 if (getstatus) {
                         p_slot->state = BLINKINGOFF_STATE;
-                        ctrl_info(ctrl,
-                                  "PCI slot #%s - powering off due to button "
-                                  "press.\n", slot_name(p_slot));
+                        ctrl_info(ctrl, "PCI slot #%s - powering off due to button press\n",
+                                  slot_name(p_slot));
                 } else {
                         p_slot->state = BLINKINGON_STATE;
-                        ctrl_info(ctrl,
-                                  "PCI slot #%s - powering on due to button "
-                                  "press.\n", slot_name(p_slot));
+                        ctrl_info(ctrl, "PCI slot #%s - powering on due to button press\n",
+                                  slot_name(p_slot));
                 }
                 /* blink green LED and turn off amber */
                 pciehp_green_led_blink(p_slot);
@@ -404,8 +402,8 @@ static void handle_button_press_event(struct slot *p_slot)
                 else
                         pciehp_green_led_off(p_slot);
                 pciehp_set_attention_status(p_slot, 0);
-                ctrl_info(ctrl, "PCI slot #%s - action canceled "
-                          "due to button press\n", slot_name(p_slot));
+                ctrl_info(ctrl, "PCI slot #%s - action canceled due to button press\n",
+                          slot_name(p_slot));
                 p_slot->state = STATIC_STATE;
                 break;
         case POWEROFF_STATE:
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 9334fc76b9d1..42914e04d110 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -174,12 +174,10 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
                          * event even though it supports none of power
                          * controller, attention led, power led and EMI.
                          */
-                        ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to "
-                                 "wait for command completed event.\n");
+                        ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to wait for command completed event\n");
                         ctrl->no_cmd_complete = 0;
                 } else {
-                        ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe "
-                                 "the controller is broken.\n");
+                        ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe the controller is broken\n");
                 }
         }
 
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index b6cb1df67097..5f871f4c4af1 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -46,9 +46,8 @@ int pciehp_configure_device(struct slot *p_slot)
 
         dev = pci_get_slot(parent, PCI_DEVFN(0, 0));
         if (dev) {
-                ctrl_err(ctrl, "Device %s already exists "
-                         "at %04x:%02x:00, cannot hot-add\n", pci_name(dev),
-                         pci_domain_nr(parent), parent->number);
+                ctrl_err(ctrl, "Device %s already exists at %04x:%02x:00, cannot hot-add\n",
+                         pci_name(dev), pci_domain_nr(parent), parent->number);
                 pci_dev_put(dev);
                 ret = -EEXIST;
                 goto out;
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 0f4c36033ade..bada20999870 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -250,15 +250,13 @@ static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot,
         }
 
         if (rc == PCI_L1_ERR) {
-                dev_dbg(&slot->pci_bus->self->dev,
-                        "L1 failure %d with message: %s",
+                dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message: %s",
                         resp.resp_sub_errno, resp.resp_l1_msg);
                 return -EPERM;
         }
 
         if (rc) {
-                dev_dbg(&slot->pci_bus->self->dev,
-                        "insert failed with error %d sub-error %d\n",
+                dev_dbg(&slot->pci_bus->self->dev, "insert failed with error %d sub-error %d\n",
                         rc, resp.resp_sub_errno);
                 return -EIO;
         }
@@ -288,21 +286,18 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
         }
 
         if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) {
-                dev_dbg(&slot->pci_bus->self->dev,
-                        "Cannot remove last 33MHz card\n");
+                dev_dbg(&slot->pci_bus->self->dev, "Cannot remove last 33MHz card\n");
                 return -EPERM;
         }
 
         if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) {
-                dev_dbg(&slot->pci_bus->self->dev,
-                        "L1 failure %d with message \n%s\n",
+                dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message \n%s\n",
                         resp.resp_sub_errno, resp.resp_l1_msg);
                 return -EPERM;
         }
 
         if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) {
-                dev_dbg(&slot->pci_bus->self->dev,
-                        "remove failed with error %d sub-error %d\n",
+                dev_dbg(&slot->pci_bus->self->dev, "remove failed with error %d sub-error %d\n",
                         rc, resp.resp_sub_errno);
                 return -EIO;
         }
@@ -417,8 +412,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                 phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion);
 
                 if (acpi_bus_get_device(phandle, &pdevice)) {
-                        dev_dbg(&slot->pci_bus->self->dev,
-                                "no parent device, assuming NULL\n");
+                        dev_dbg(&slot->pci_bus->self->dev, "no parent device, assuming NULL\n");
                         pdevice = NULL;
                 }
 
@@ -447,10 +441,8 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
 
                                 ret = acpi_bus_scan(chandle);
                                 if (ACPI_FAILURE(ret)) {
-                                        printk(KERN_ERR "%s: acpi_bus_scan "
-                                               "failed (0x%x) for slot %d "
-                                               "func %d\n", __func__,
-                                               ret, (int)(adr>>16),
+                                        printk(KERN_ERR "%s: acpi_bus_scan failed (0x%x) for slot %d func %d\n",
+                                               __func__, ret, (int)(adr>>16),
                                                (int)(adr&0xffff));
                                         /* try to continue on */
                                 }
@@ -471,11 +463,9 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
         mutex_unlock(&sn_hotplug_mutex);
 
         if (rc == 0)
-                dev_dbg(&slot->pci_bus->self->dev,
-                        "insert operation successful\n");
+                dev_dbg(&slot->pci_bus->self->dev, "insert operation successful\n");
         else
-                dev_dbg(&slot->pci_bus->self->dev,
-                        "insert operation failed rc = %d\n", rc);
+                dev_dbg(&slot->pci_bus->self->dev, "insert operation failed rc = %d\n", rc);
 
         return rc;
 }
@@ -561,8 +551,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
                 acpi_status ret;
                 ret = acpi_unload_table_id(ssdt_id);
                 if (ACPI_FAILURE(ret)) {
-                        printk(KERN_ERR "%s: acpi_unload_table_id "
-                               "failed (0x%x) for id %d\n",
+                        printk(KERN_ERR "%s: acpi_unload_table_id failed (0x%x) for id %d\n",
                                __func__, ret, ssdt_id);
                         /* try to continue on */
                 }
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index faf13abd5b99..294ef4b10cf1 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -143,8 +143,7 @@ static int init_slots(struct controller *ctrl)
                 snprintf(name, SLOT_NAME_SIZE, "%d", slot->number);
                 hotplug_slot->ops = &shpchp_hotplug_slot_ops;
 
-                ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x "
-                         "hp_slot=%x sun=%x slot_device_offset=%x\n",
+                ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x hp_slot=%x sun=%x slot_device_offset=%x\n",
                          pci_domain_nr(ctrl->pci_dev->subordinate),
                          slot->bus, slot->device, slot->hp_slot, slot->number,
                          ctrl->slot_device_offset);
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 90cd75c1a3a7..e57972366c91 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -196,8 +196,8 @@ static int change_bus_speed(struct controller *ctrl, struct slot *p_slot,
 
         ctrl_dbg(ctrl, "Change speed to %d\n", speed);
         if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, speed))) {
-                ctrl_err(ctrl, "%s: Issue of set bus speed mode command "
-                         "failed\n", __func__);
+                ctrl_err(ctrl, "%s: Issue of set bus speed mode command failed\n",
+                         __func__);
                 return WRONG_BUS_FREQUENCY;
         }
         return rc;
@@ -215,8 +215,8 @@ static int fix_bus_speed(struct controller *ctrl, struct slot *pslot,
          */
         if (flag) {
                 if (asp < bsp) {
-                        ctrl_err(ctrl, "Speed of bus %x and adapter %x "
-                                 "mismatch\n", bsp, asp);
+                        ctrl_err(ctrl, "Speed of bus %x and adapter %x mismatch\n",
+                                 bsp, asp);
                         rc = WRONG_BUS_FREQUENCY;
                 }
                 return rc;
@@ -250,8 +250,7 @@ static int board_added(struct slot *p_slot)
 
         hp_slot = p_slot->device - ctrl->slot_device_offset;
 
-        ctrl_dbg(ctrl,
-                 "%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n",
+        ctrl_dbg(ctrl, "%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n",
                  __func__, p_slot->device, ctrl->slot_device_offset, hp_slot);
 
         /* Power on slot without connecting to bus */
@@ -263,8 +262,8 @@ static int board_added(struct slot *p_slot)
 
         if ((ctrl->pci_dev->vendor == 0x8086) && (ctrl->pci_dev->device == 0x0332)) {
                 if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, PCI_SPEED_33MHz))) {
-                        ctrl_err(ctrl, "%s: Issue of set bus speed mode command"
-                                 " failed\n", __func__);
+                        ctrl_err(ctrl, "%s: Issue of set bus speed mode command failed\n",
+                                 __func__);
                         return WRONG_BUS_FREQUENCY;
                 }
 
@@ -277,8 +276,7 @@ static int board_added(struct slot *p_slot)
 
         rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &asp);
         if (rc) {
-                ctrl_err(ctrl, "Can't get adapter speed or "
-                         "bus mode mismatch\n");
+                ctrl_err(ctrl, "Can't get adapter speed or bus mode mismatch\n");
                 return WRONG_BUS_FREQUENCY;
         }
 
@@ -289,8 +287,8 @@ static int board_added(struct slot *p_slot)
         if (!list_empty(&ctrl->pci_dev->subordinate->devices))
                 slots_not_empty = 1;
 
-        ctrl_dbg(ctrl, "%s: slots_not_empty %d, adapter_speed %d, bus_speed %d,"
-                 " max_bus_speed %d\n", __func__, slots_not_empty, asp,
+        ctrl_dbg(ctrl, "%s: slots_not_empty %d, adapter_speed %d, bus_speed %d, max_bus_speed %d\n",
+                 __func__, slots_not_empty, asp,
                  bsp, msp);
 
         rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, asp, bsp, msp);
@@ -490,12 +488,12 @@ static void handle_button_press_event(struct slot *p_slot)
                 p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                 if (getstatus) {
                         p_slot->state = BLINKINGOFF_STATE;
-                        ctrl_info(ctrl, "PCI slot #%s - powering off due to "
-                                  "button press.\n", slot_name(p_slot));
+                        ctrl_info(ctrl, "PCI slot #%s - powering off due to button press\n",
+                                  slot_name(p_slot));
                 } else {
                         p_slot->state = BLINKINGON_STATE;
-                        ctrl_info(ctrl, "PCI slot #%s - powering on due to "
-                                  "button press.\n", slot_name(p_slot));
+                        ctrl_info(ctrl, "PCI slot #%s - powering on due to button press\n",
+                                  slot_name(p_slot));
                 }
                 /* blink green LED and turn off amber */
                 p_slot->hpc_ops->green_led_blink(p_slot);
@@ -518,8 +516,8 @@ static void handle_button_press_event(struct slot *p_slot)
                 else
                         p_slot->hpc_ops->green_led_off(p_slot);
                 p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                ctrl_info(ctrl, "PCI slot #%s - action canceled due to "
-                          "button press\n", slot_name(p_slot));
+                ctrl_info(ctrl, "PCI slot #%s - action canceled due to button press\n",
+                          slot_name(p_slot));
                 p_slot->state = STATIC_STATE;
                 break;
         case POWEROFF_STATE:
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 12aa9e2b78aa..29e22352822c 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -341,8 +341,7 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)
 
         cmd_status = hpc_check_cmd_status(slot->ctrl);
         if (cmd_status) {
-                ctrl_err(ctrl,
-                         "Failed to issued command 0x%x (error code = %d)\n",
+                ctrl_err(ctrl, "Failed to issued command 0x%x (error code = %d)\n",
                          cmd, cmd_status);
                 retval = -EIO;
         }
@@ -974,8 +973,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
                 for (i = 0; i < 9 + num_slots; i++) {
                         rc = shpc_indirect_read(ctrl, i, &tempdword);
                         if (rc) {
-                                ctrl_err(ctrl,
-                                         "Cannot read creg (index = %d)\n", i);
+                                ctrl_err(ctrl, "Cannot read creg (index = %d)\n",
+                                         i);
                                 goto abort;
                         }
                         ctrl_dbg(ctrl, " offset %d: value %x\n", i, tempdword);
@@ -1060,10 +1059,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
                 /* Installs the interrupt handler */
                 rc = pci_enable_msi(pdev);
                 if (rc) {
-                        ctrl_info(ctrl,
-                                  "Can't get msi for the hotplug controller\n");
-                        ctrl_info(ctrl,
-                                  "Use INTx for the hotplug controller\n");
+                        ctrl_info(ctrl, "Can't get msi for the hotplug controller\n");
+                        ctrl_info(ctrl, "Use INTx for the hotplug controller\n");
                 }
 
                 rc = request_irq(ctrl->pci_dev->irq, shpc_isr, IRQF_SHARED,
@@ -1071,8 +1068,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
                 ctrl_dbg(ctrl, "request_irq %d (returns %d)\n",
                          ctrl->pci_dev->irq, rc);
                 if (rc) {
-                        ctrl_err(ctrl, "Can't get irq %d for the hotplug "
-                                 "controller\n", ctrl->pci_dev->irq);
+                        ctrl_err(ctrl, "Can't get irq %d for the hotplug controller\n",
+                                 ctrl->pci_dev->irq);
                         goto abort_iounmap;
                 }
         }
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index 9202d133485c..469454e0cc48 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -46,9 +46,9 @@ int shpchp_configure_device(struct slot *p_slot)
 
         dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0));
         if (dev) {
-                ctrl_err(ctrl, "Device %s already exists "
-                         "at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev),
-                         pci_domain_nr(parent), p_slot->bus, p_slot->device);
+                ctrl_err(ctrl, "Device %s already exists at %04x:%02x:%02x, cannot hot-add\n",
+                         pci_name(dev), pci_domain_nr(parent),
+                         p_slot->bus, p_slot->device);
                 pci_dev_put(dev);
                 ret = -EINVAL;
                 goto out;
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 27a7e67ddfe4..5a68b485e547 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -980,8 +980,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
 
         /* Check whether driver already requested for MSI irq */
         if (dev->msi_enabled) {
-                dev_info(&dev->dev, "can't enable MSI-X "
-                       "(MSI IRQ already assigned)\n");
+                dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n");
                 return -EINVAL;
         }
         status = msix_capability_init(dev, entries, nvec);
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 41d8d0307347..9ff0a901ecf7 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -286,8 +286,8 @@ static ssize_t msi_bus_store(struct device *dev, struct device_attribute *attr,
             !!val) {
                 pdev->subordinate->bus_flags ^= PCI_BUS_FLAGS_NO_MSI;
 
-                dev_warn(&pdev->dev, "forced subordinate bus to%s support MSI,"
-                         " bad things could happen\n", val ? "" : " not");
+                dev_warn(&pdev->dev, "forced subordinate bus to%s support MSI, bad things could happen\n",
+                         val ? "" : " not");
         }
 
         return count;
@@ -945,8 +945,7 @@ legacy_io_err:
         kfree(b->legacy_io);
         b->legacy_io = NULL;
 kzalloc_err:
-        printk(KERN_WARNING "pci: warning: could not create legacy I/O port "
-               "and ISA memory resources to sysfs\n");
+        printk(KERN_WARNING "pci: warning: could not create legacy I/O port and ISA memory resources to sysfs\n");
         return;
 }
 
@@ -1006,8 +1005,7 @@ static int pci_mmap_resource(struct kobject *kobj, struct bin_attribute *attr,
                 return -ENODEV;
 
         if (!pci_mmap_fits(pdev, i, vma, PCI_MMAP_SYSFS)) {
-                WARN(1, "process \"%s\" tried to map 0x%08lx bytes "
-                        "at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n",
+                WARN(1, "process \"%s\" tried to map 0x%08lx bytes at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n",
                         current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff,
                         pci_name(pdev), i,
                         (u64)pci_resource_start(pdev, i),
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 952b4b489d0f..0a271a100986 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -555,8 +555,8 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)
          */
         if (state != PCI_D0 && dev->current_state <= PCI_D3cold
             && dev->current_state > state) {
-                dev_err(&dev->dev, "invalid power transition "
-                        "(from state %d to %d)\n", dev->current_state, state);
+                dev_err(&dev->dev, "invalid power transition (from state %d to %d)\n",
+                        dev->current_state, state);
                 return -EINVAL;
         }
 
@@ -603,8 +603,8 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)
         pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
         dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
         if (dev->current_state != state && printk_ratelimit())
-                dev_info(&dev->dev, "Refused to change power state, "
-                        "currently in D%d\n", dev->current_state);
+                dev_info(&dev->dev, "Refused to change power state, currently in D%d\n",
+                         dev->current_state);
 
         /*
          * According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT
@@ -1029,8 +1029,8 @@ static void pci_restore_config_dword(struct pci_dev *pdev, int offset,
                 return;
 
         for (;;) {
-                dev_dbg(&pdev->dev, "restoring config space at offset "
-                        "%#x (was %#x, writing %#x)\n", offset, val, saved_val);
+                dev_dbg(&pdev->dev, "restoring config space at offset %#x (was %#x, writing %#x)\n",
+                        offset, val, saved_val);
                 pci_write_config_dword(pdev, offset, saved_val);
                 if (retry-- <= 0)
                         return;
@@ -2815,8 +2815,8 @@ int pci_set_cacheline_size(struct pci_dev *dev)
         if (cacheline_size == pci_cache_line_size)
                 return 0;
 
-        dev_printk(KERN_DEBUG, &dev->dev, "cache line size of %d is not "
-                   "supported\n", pci_cache_line_size << 2);
+        dev_printk(KERN_DEBUG, &dev->dev, "cache line size of %d is not supported\n",
+                   pci_cache_line_size << 2);
 
         return -EINVAL;
 }
@@ -2952,8 +2952,8 @@ bool pci_intx_mask_supported(struct pci_dev *dev)
          * go ahead and check it.
          */
         if ((new ^ orig) & ~PCI_COMMAND_INTX_DISABLE) {
-                dev_err(&dev->dev, "Command register changed from "
-                        "0x%x to 0x%x: driver or hardware bug?\n", orig, new);
+                dev_err(&dev->dev, "Command register changed from 0x%x to 0x%x: driver or hardware bug?\n",
+                        orig, new);
         } else if ((new ^ orig) & PCI_COMMAND_INTX_DISABLE) {
                 mask_supported = true;
                 pci_write_config_word(dev, PCI_COMMAND, orig);
@@ -3138,8 +3138,7 @@ static int pci_af_flr(struct pci_dev *dev, int probe)
         if (pci_wait_for_pending(dev, PCI_AF_STATUS, PCI_AF_STATUS_TP))
                 goto clear;
 
-        dev_err(&dev->dev, "transaction is not cleared; "
-                        "proceeding with reset anyway\n");
+        dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n");
 
 clear:
         pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR);
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index d82cb8fd452e..182224acedbe 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -397,16 +397,14 @@ static int aer_inject(struct aer_error_inj *einj)
         if (!aer_mask_override && einj->cor_status &&
             !(einj->cor_status & ~cor_mask)) {
                 ret = -EINVAL;
-                printk(KERN_WARNING "The correctable error(s) is masked "
-                                "by device\n");
+                printk(KERN_WARNING "The correctable error(s) is masked by device\n");
                 spin_unlock_irqrestore(&inject_lock, flags);
                 goto out_put;
         }
         if (!aer_mask_override && einj->uncor_status &&
             !(einj->uncor_status & ~uncor_mask)) {
                 ret = -EINVAL;
-                printk(KERN_WARNING "The uncorrectable error(s) is masked "
-                                "by device\n");
+                printk(KERN_WARNING "The uncorrectable error(s) is masked by device\n");
                 spin_unlock_irqrestore(&inject_lock, flags);
                 goto out_put;
         }
diff --git a/drivers/pci/pcie/aer/aerdrv_errprint.c b/drivers/pci/pcie/aer/aerdrv_errprint.c
index 34ff7026440c..36ed31b52198 100644
--- a/drivers/pci/pcie/aer/aerdrv_errprint.c
+++ b/drivers/pci/pcie/aer/aerdrv_errprint.c
@@ -172,9 +172,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
         int id = ((dev->bus->number << 8) | dev->devfn);
 
         if (!info->status) {
-                dev_err(&dev->dev,
-                        "PCIe Bus Error: severity=%s, type=Unaccessible, "
-                        "id=%04x(Unregistered Agent ID)\n",
+                dev_err(&dev->dev, "PCIe Bus Error: severity=%s, type=Unaccessible, id=%04x(Unregistered Agent ID)\n",
                         aer_error_severity_string[info->severity], id);
                 goto out;
         }
@@ -182,13 +180,11 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
         layer = AER_GET_LAYER_ERROR(info->severity, info->status);
         agent = AER_GET_AGENT(info->severity, info->status);
 
-        dev_err(&dev->dev,
-                "PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n",
+        dev_err(&dev->dev, "PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n",
                 aer_error_severity_string[info->severity],
                 aer_error_layer[layer], id, aer_agent_string[agent]);
 
-        dev_err(&dev->dev,
-                "  device [%04x:%04x] error status/mask=%08x/%08x\n",
+        dev_err(&dev->dev, "  device [%04x:%04x] error status/mask=%08x/%08x\n",
                 dev->vendor, dev->device,
                 info->status, info->mask);
 
diff --git a/drivers/pci/pcie/pme.c b/drivers/pci/pcie/pme.c
index bbc3bdd2b189..82e06a86cd77 100644
--- a/drivers/pci/pcie/pme.c
+++ b/drivers/pci/pcie/pme.c
@@ -199,8 +199,7 @@ static void pcie_pme_handle_request(struct pci_dev *port, u16 req_id)
                  * assuming that the PME was reported by a PCIe-PCI bridge that
                  * used devfn different from zero.
                  */
-                dev_dbg(&port->dev, "PME interrupt generated for "
-                        "non-existent device %02x:%02x.%d\n",
+                dev_dbg(&port->dev, "PME interrupt generated for non-existent device %02x:%02x.%d\n",
                         busnr, PCI_SLOT(devfn), PCI_FUNC(devfn));
                 found = pcie_pme_from_pci_bridge(bus, 0);
         }
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 0d8fdc48e642..80887eaa0668 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -204,8 +204,8 @@ static int pcie_portdrv_probe(struct pci_dev *dev,
                 return -ENODEV;
 
         if (!dev->irq && dev->pin) {
-                dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; "
-                         "check vendor BIOS\n", dev->vendor, dev->device);
+                dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; check vendor BIOS\n",
+                         dev->vendor, dev->device);
         }
         status = pcie_port_device_register(dev);
         if (status)
@@ -397,7 +397,7 @@ static struct pci_driver pcie_portdriver = {
 static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
 {
         pr_notice("%s detected: will not use MSI for PCIe PME signaling\n",
-                        d->ident);
+                  d->ident);
         pcie_pme_disable_msi();
         return 0;
 }
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 468a6505bef1..e3cf8a2e6292 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -433,8 +433,7 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child)
                         limit |= ((unsigned long) mem_limit_hi) << 32;
 #else
                         if (mem_base_hi || mem_limit_hi) {
-                                dev_err(&dev->dev, "can't handle 64-bit "
-                                        "address space for bridge\n");
+                                dev_err(&dev->dev, "can't handle 64-bit address space for bridge\n");
                                 return;
                         }
 #endif
@@ -933,8 +932,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
                     (child->number > bus->busn_res.end) ||
                     (child->number < bus->number) ||
                     (child->busn_res.end < bus->number)) {
-                        dev_info(&child->dev, "%pR %s "
-                                "hidden behind%s bridge %s %pR\n",
+                        dev_info(&child->dev, "%pR %s hidden behind%s bridge %s %pR\n",
                                 &child->busn_res,
                                 (bus->number > child->busn_res.end &&
                                  bus->busn_res.end < child->number) ?
@@ -1224,13 +1222,13 @@ int pci_setup_device(struct pci_dev *dev)
                 break;
 
         default:                                    /* unknown header */
-                dev_err(&dev->dev, "unknown header type %02x, "
-                        "ignoring device\n", dev->hdr_type);
+                dev_err(&dev->dev, "unknown header type %02x, ignoring device\n",
+                        dev->hdr_type);
                 return -EIO;
 
         bad:
-                dev_err(&dev->dev, "ignoring class %#08x (doesn't match header "
-                        "type %02x)\n", dev->class, dev->hdr_type);
+                dev_err(&dev->dev, "ignoring class %#08x (doesn't match header type %02x)\n",
+                        dev->class, dev->hdr_type);
                 dev->class = PCI_CLASS_NOT_DEFINED;
         }
 
@@ -1305,10 +1303,9 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,
                         return false;
                 /* Card hasn't responded in 60 seconds?  Must be stuck. */
                 if (delay > crs_timeout) {
-                        printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not "
-                                        "responding\n", pci_domain_nr(bus),
-                                        bus->number, PCI_SLOT(devfn),
-                                        PCI_FUNC(devfn));
+                        printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not responding\n",
+                               pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
+                               PCI_FUNC(devfn));
                         return false;
                 }
         }
@@ -1613,9 +1610,7 @@ static void pcie_write_mrrs(struct pci_dev *dev)
         }
 
         if (mrrs < 128)
-                dev_err(&dev->dev, "MRRS was unable to be configured with a "
-                        "safe value.  If problems are experienced, try running "
-                        "with pci=pcie_bus_safe.\n");
+                dev_err(&dev->dev, "MRRS was unable to be configured with a safe value.  If problems are experienced, try running with pci=pcie_bus_safe\n");
 }
 
 static void pcie_bus_detect_mps(struct pci_dev *dev)
@@ -1652,8 +1647,8 @@ static int pcie_bus_configure_set(struct pci_dev *dev, void *data)
         pcie_write_mps(dev, mps);
         pcie_write_mrrs(dev);
 
-        dev_info(&dev->dev, "Max Payload Size set to %4d/%4d (was %4d), "
-                 "Max Read Rq %4d\n", pcie_get_mps(dev), 128 << dev->pcie_mpss,
+        dev_info(&dev->dev, "Max Payload Size set to %4d/%4d (was %4d), Max Read Rq %4d\n",
+                 pcie_get_mps(dev), 128 << dev->pcie_mpss,
                  orig_mps, pcie_get_readrq(dev));
 
         return 0;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index e0d78d23483a..f01c50d9f6d7 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -315,8 +315,7 @@ static void quirk_cs5536_vsa(struct pci_dev *dev)
         if (pci_resource_len(dev, 0) != 8) {
                 struct resource *res = &dev->resource[0];
                 res->end = res->start + 8 - 1;
-                dev_info(&dev->dev, "CS5536 ISA bridge bug detected "
-                                "(incorrect header); workaround applied.\n");
+                dev_info(&dev->dev, "CS5536 ISA bridge bug detected (incorrect header); workaround applied\n");
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa);
@@ -400,7 +399,8 @@ static void piix4_io_quirk(struct pci_dev *dev, const char *name, unsigned int p
          * let's get enough confirmation reports first.
          */
         base &= -size;
-        dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base, base + size - 1);
+        dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base,
+                 base + size - 1);
 }
 
 static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable)
@@ -425,7 +425,8 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int
          * reserve it, but let's get enough confirmation reports first.
          */
         base &= -size;
-        dev_info(&dev->dev, "%s MMIO at %04x-%04x\n", name, base, base + size - 1);
+        dev_info(&dev->dev, "%s MMIO at %04x-%04x\n", name, base,
+                 base + size - 1);
 }
 
 /*
@@ -668,8 +669,7 @@ static void quirk_xio2000a(struct pci_dev *dev)
         struct pci_dev *pdev;
         u16 command;
 
-        dev_warn(&dev->dev, "TI XIO2000a quirk detected; "
-                "secondary bus fast back-to-back transfers disabled\n");
+        dev_warn(&dev->dev, "TI XIO2000a quirk detected; secondary bus fast back-to-back transfers disabled\n");
         list_for_each_entry(pdev, &dev->subordinate->devices, bus_list) {
                 pci_read_config_word(pdev, PCI_COMMAND, &command);
                 if (command & PCI_COMMAND_FAST_BACK)
@@ -761,8 +761,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI,	PCI_ANY_ID,			quirk_ioapic_rmw);
 static void quirk_amd_8131_mmrbc(struct pci_dev *dev)
 {
         if (dev->subordinate && dev->revision <= 0x12) {
-                dev_info(&dev->dev, "AMD8131 rev %x detected; "
-                        "disabling PCI-X MMRBC\n", dev->revision);
+                dev_info(&dev->dev, "AMD8131 rev %x detected; disabling PCI-X MMRBC\n",
+                         dev->revision);
                 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC;
         }
 }
@@ -971,7 +971,8 @@ static void quirk_mediagx_master(struct pci_dev *dev)
         pci_read_config_byte(dev, 0x41, &reg);
         if (reg & 2) {
                 reg &= ~2;
-                dev_info(&dev->dev, "Fixup for MediaGX/Geode Slave Disconnect Boundary (0x41=0x%02x)\n", reg);
+                dev_info(&dev->dev, "Fixup for MediaGX/Geode Slave Disconnect Boundary (0x41=0x%02x)\n",
+                         reg);
                 pci_write_config_byte(dev, 0x41, reg);
         }
 }
@@ -1262,7 +1263,8 @@ static void asus_hides_smbus_lpc(struct pci_dev *dev)
                 pci_write_config_word(dev, 0xF2, val & (~0x8));
                 pci_read_config_word(dev, 0xF2, &val);
                 if (val & 0x8)
-                        dev_info(&dev->dev, "i801 SMBus device continues to play 'hide and seek'! 0x%x\n", val);
+                        dev_info(&dev->dev, "i801 SMBus device continues to play 'hide and seek'! 0x%x\n",
+                                 val);
                 else
                         dev_info(&dev->dev, "Enabled i801 SMBus device\n");
         }
@@ -1410,7 +1412,8 @@ static void asus_hides_ac97_lpc(struct pci_dev *dev)
                 pci_write_config_byte(dev, 0x50, val & (~0xc0));
                 pci_read_config_byte(dev, 0x50, &val);
                 if (val & 0xc0)
-                        dev_info(&dev->dev, "Onboard AC97/MC97 devices continue to play 'hide and seek'! 0x%x\n", val);
+                        dev_info(&dev->dev, "Onboard AC97/MC97 devices continue to play 'hide and seek'! 0x%x\n",
+                                 val);
                 else
                         dev_info(&dev->dev, "Enabled onboard AC97/MC97 devices\n");
         }
@@ -1720,8 +1723,8 @@ static void quirk_disable_amd_8111_boot_interrupt(struct pci_dev *dev)
 
         pci_read_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, &pci_config_word);
         if (!pci_config_word) {
-                dev_info(&dev->dev, "boot interrupts on device [%04x:%04x] "
-                         "already disabled\n", dev->vendor, dev->device);
+                dev_info(&dev->dev, "boot interrupts on device [%04x:%04x] already disabled\n",
+                         dev->vendor, dev->device);
                 return;
         }
         pci_write_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, 0);
@@ -1769,8 +1772,7 @@ static void quirk_plx_pci9050(struct pci_dev *dev)
                 if (pci_resource_len(dev, bar) == 0x80 &&
                     (pci_resource_start(dev, bar) & 0x80)) {
                         struct resource *r = &dev->resource[bar];
-                        dev_info(&dev->dev,
-                                 "Re-allocating PLX PCI 9050 BAR %u to length 256 to avoid bit 7 bug\n",
+                        dev_info(&dev->dev, "Re-allocating PLX PCI 9050 BAR %u to length 256 to avoid bit 7 bug\n",
                                  bar);
                         r->flags |= IORESOURCE_UNSET;
                         r->start = 0;
@@ -1817,9 +1819,7 @@ static void quirk_netmos(struct pci_dev *dev)
         case PCI_DEVICE_ID_NETMOS_9845:
         case PCI_DEVICE_ID_NETMOS_9855:
                 if (num_parallel) {
-                        dev_info(&dev->dev, "Netmos %04x (%u parallel, "
-                                "%u serial); changing class SERIAL to OTHER "
-                                "(use parport_serial)\n",
+                        dev_info(&dev->dev, "Netmos %04x (%u parallel, %u serial); changing class SERIAL to OTHER (use parport_serial)\n",
                                 dev->device, num_parallel, num_serial);
                         dev->class = (PCI_CLASS_COMMUNICATION_OTHER << 8) |
                             (dev->class & 0xff);
@@ -1886,8 +1886,7 @@ static void quirk_e100_interrupt(struct pci_dev *dev)
 
         cmd_hi = readb(csr + 3);
         if (cmd_hi == 0) {
-                dev_warn(&dev->dev, "Firmware left e100 interrupts enabled; "
-                        "disabling\n");
+                dev_warn(&dev->dev, "Firmware left e100 interrupts enabled; disabling\n");
                 writeb(1, csr + 3);
         }
 
@@ -1957,8 +1956,7 @@ static void quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
         if (pci_read_config_byte(dev, 0xf41, &b) == 0) {
                 if (!(b & 0x20)) {
                         pci_write_config_byte(dev, 0xf41, b | 0x20);
-                        dev_info(&dev->dev,
-                               "Linking AER extended capability\n");
+                        dev_info(&dev->dev, "Linking AER extended capability\n");
                 }
         }
 }
@@ -1996,8 +1994,7 @@ static void quirk_via_cx700_pci_parking_caching(struct pci_dev *dev)
                         /* Turn off PCI Bus Parking */
                         pci_write_config_byte(dev, 0x76, b ^ 0x40);
 
-                        dev_info(&dev->dev,
-                                "Disabling VIA CX700 PCI parking\n");
+                        dev_info(&dev->dev, "Disabling VIA CX700 PCI parking\n");
                 }
         }
 
@@ -2012,8 +2009,7 @@ static void quirk_via_cx700_pci_parking_caching(struct pci_dev *dev)
                         /* Disable "Read FIFO Timer" */
                         pci_write_config_byte(dev, 0x77, 0x0);
 
-                        dev_info(&dev->dev,
-                                "Disabling VIA CX700 PCI caching\n");
+                        dev_info(&dev->dev, "Disabling VIA CX700 PCI caching\n");
                 }
         }
 }
@@ -2148,8 +2144,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8380_0, quirk_disab
 static void quirk_disable_msi(struct pci_dev *dev)
 {
         if (dev->subordinate) {
-                dev_warn(&dev->dev, "MSI quirk detected; "
-                        "subordinate MSI disabled\n");
+                dev_warn(&dev->dev, "MSI quirk detected; subordinate MSI disabled\n");
                 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
         }
 }
@@ -2205,8 +2200,7 @@ static int msi_ht_cap_enabled(struct pci_dev *dev)
 static void quirk_msi_ht_cap(struct pci_dev *dev)
 {
         if (dev->subordinate && !msi_ht_cap_enabled(dev)) {
-                dev_warn(&dev->dev, "MSI quirk detected; "
-                        "subordinate MSI disabled\n");
+                dev_warn(&dev->dev, "MSI quirk detected; subordinate MSI disabled\n");
                 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
         }
 }
@@ -2230,8 +2224,7 @@ static void quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
         if (!pdev)
                 return;
         if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
-                dev_warn(&dev->dev, "MSI quirk detected; "
-                        "subordinate MSI disabled\n");
+                dev_warn(&dev->dev, "MSI quirk detected; subordinate MSI disabled\n");
                 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI;
         }
         pci_dev_put(pdev);
@@ -2277,8 +2270,7 @@ static void nvenet_msi_disable(struct pci_dev *dev)
         if (board_name &&
             (strstr(board_name, "P5N32-SLI PREMIUM") ||
              strstr(board_name, "P5N32-E SLI"))) {
-                dev_info(&dev->dev,
-                         "Disabling msi for MCP55 NIC on P5N32-SLI\n");
+                dev_info(&dev->dev, "Disabling msi for MCP55 NIC on P5N32-SLI\n");
                 dev->no_msi = 1;
         }
 }
@@ -2487,8 +2479,7 @@ static void __nv_msi_ht_cap_quirk(struct pci_dev *dev, int all)
          */
         host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
         if (host_bridge == NULL) {
-                dev_warn(&dev->dev,
-                         "nv_msi_ht_cap_quirk didn't locate host bridge\n");
+                dev_warn(&dev->dev, "nv_msi_ht_cap_quirk didn't locate host bridge\n");
                 return;
         }
 
@@ -2815,8 +2806,7 @@ static void quirk_intel_mc_errata(struct pci_dev *dev)
          */
         err = pci_read_config_word(dev, 0x48, &rcc);
         if (err) {
-                dev_err(&dev->dev, "Error attempting to read the read "
-                        "completion coalescing register.\n");
+                dev_err(&dev->dev, "Error attempting to read the read completion coalescing register\n");
                 return;
         }
 
@@ -2827,13 +2817,11 @@ static void quirk_intel_mc_errata(struct pci_dev *dev)
 
         err = pci_write_config_word(dev, 0x48, rcc);
         if (err) {
-                dev_err(&dev->dev, "Error attempting to write the read "
-                        "completion coalescing register.\n");
+                dev_err(&dev->dev, "Error attempting to write the read completion coalescing register\n");
                 return;
         }
 
-        pr_info_once("Read completion coalescing disabled due to hardware "
-                     "errata relating to 256B MPS.\n");
+        pr_info_once("Read completion coalescing disabled due to hardware errata relating to 256B MPS\n");
 }
 /* Intel 5000 series memory controllers and ports 2-7 */
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x25c0, quirk_intel_mc_errata);
@@ -2942,8 +2930,7 @@ static void disable_igfx_irq(struct pci_dev *dev)
 
         /* Check if any interrupt line is still enabled */
         if (readl(regs + I915_DEIER_REG) != 0) {
-                dev_warn(&dev->dev, "BIOS left Intel GPU interrupts enabled; "
-                        "disabling\n");
+                dev_warn(&dev->dev, "BIOS left Intel GPU interrupts enabled; disabling\n");
 
                 writel(0, regs + I915_DEIER_REG);
         }
@@ -3110,8 +3097,8 @@ static int __init pci_apply_final_quirks(void)
                         if (!tmp || cls == tmp)
                                 continue;
 
-                        printk(KERN_DEBUG "PCI: CLS mismatch (%u != %u), "
-                               "using %u bytes\n", cls << 2, tmp << 2,
+                        printk(KERN_DEBUG "PCI: CLS mismatch (%u != %u), using %u bytes\n",
+                               cls << 2, tmp << 2,
                                pci_dfl_cache_line_size << 2);
                         pci_cache_line_size = pci_dfl_cache_line_size;
                 }
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 2f053922dd5c..a5a63ecfb628 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -148,8 +148,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
 
                 tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
                 if (!tmp)
-                        panic("pdev_sort_resources(): "
-                              "kmalloc() failed!\n");
+                        panic("pdev_sort_resources(): kmalloc() failed!\n");
                 tmp->res = r;
                 tmp->dev = dev;
 
@@ -859,9 +858,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
                         resource_size(b_res), min_align);
         if (!size0 && !size1) {
                 if (b_res->start || b_res->end)
-                        dev_info(&bus->self->dev, "disabling bridge window "
-                                 "%pR to %pR (unused)\n", b_res,
-                                 &bus->busn_res);
+                        dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n",
+                                 b_res, &bus->busn_res);
                 b_res->flags = 0;
                 return;
         }
@@ -872,10 +870,9 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
         if (size1 > size0 && realloc_head) {
                 add_to_list(realloc_head, bus->self, b_res, size1-size0,
                             min_align);
-                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window "
-                                 "%pR to %pR add_size %llx\n", b_res,
-                                 &bus->busn_res,
-                                 (unsigned long long)size1-size0);
+                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx\n",
+                           b_res, &bus->busn_res,
+                           (unsigned long long)size1-size0);
         }
 }
 
@@ -974,9 +971,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
                         if (order < 0)
                                 order = 0;
                         if (order >= ARRAY_SIZE(aligns)) {
-                                dev_warn(&dev->dev, "disabling BAR %d: %pR "
-                                         "(bad alignment %#llx)\n", i, r,
-                                         (unsigned long long) align);
+                                dev_warn(&dev->dev, "disabling BAR %d: %pR (bad alignment %#llx)\n",
+                                         i, r, (unsigned long long) align);
                                 r->flags = 0;
                                 continue;
                         }
@@ -1003,9 +999,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
                                 resource_size(b_res), min_align);
         if (!size0 && !size1) {
                 if (b_res->start || b_res->end)
-                        dev_info(&bus->self->dev, "disabling bridge window "
-                                 "%pR to %pR (unused)\n", b_res,
-                                 &bus->busn_res);
+                        dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n",
+                                 b_res, &bus->busn_res);
                 b_res->flags = 0;
                 return 0;
         }
@@ -1014,9 +1009,9 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
         b_res->flags |= IORESOURCE_STARTALIGN;
         if (size1 > size0 && realloc_head) {
                 add_to_list(realloc_head, bus->self, b_res, size1-size0, min_align);
-                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window "
-                                 "%pR to %pR add_size %llx\n", b_res,
-                                 &bus->busn_res, (unsigned long long)size1-size0);
+                dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx\n",
+                           b_res, &bus->busn_res,
+                           (unsigned long long)size1-size0);
         }
         return 0;
 }
@@ -1274,8 +1269,8 @@ void __pci_bus_assign_resources(const struct pci_bus *bus,
                         break;
 
                 default:
-                        dev_info(&dev->dev, "not setting up bridge for bus "
-                                 "%04x:%02x\n", pci_domain_nr(b), b->number);
+                        dev_info(&dev->dev, "not setting up bridge for bus %04x:%02x\n",
+                                 pci_domain_nr(b), b->number);
                         break;
                 }
         }
@@ -1312,8 +1307,8 @@ static void __pci_bridge_assign_resources(const struct pci_dev *bridge,
                 break;
 
         default:
-                dev_info(&bridge->dev, "not setting up bridge for bus "
-                         "%04x:%02x\n", pci_domain_nr(b), b->number);
+                dev_info(&bridge->dev, "not setting up bridge for bus %04x:%02x\n",
+                         pci_domain_nr(b), b->number);
                 break;
         }
 }
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 211b36f96ff3..caed1ce6facd 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -96,8 +96,8 @@ void pci_update_resource(struct pci_dev *dev, int resno)
                 pci_write_config_dword(dev, reg + 4, new);
                 pci_read_config_dword(dev, reg + 4, &check);
                 if (check != new) {
-                        dev_err(&dev->dev, "BAR %d: error updating "
-                               "(high %#08x != %#08x)\n", resno, new, check);
+                        dev_err(&dev->dev, "BAR %d: error updating (high %#08x != %#08x)\n",
+                                resno, new, check);
                 }
         }
 
@@ -289,8 +289,8 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
         res->flags |= IORESOURCE_UNSET;
         align = pci_resource_alignment(dev, res);
         if (!align) {
-                dev_info(&dev->dev, "BAR %d: can't assign %pR "
-                         "(bogus alignment)\n", resno, res);
+                dev_info(&dev->dev, "BAR %d: can't assign %pR (bogus alignment)\n",
+                         resno, res);
                 return -EINVAL;
         }
 
@@ -325,8 +325,8 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz
 
         res->flags |= IORESOURCE_UNSET;
         if (!res->parent) {
-                dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR "
-                         "\n", resno, res);
+                dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR\n",
+                         resno, res);
                 return -EINVAL;
         }