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>

15 files changed, 71 insertions, 112 deletions

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;