diff options
author | Ryan Desfosses <ryan@desfo.org> | 2014-04-18 20:13:50 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-10 22:20:42 -0400 |
commit | 227f06470502c4fea3d93df1f12a77e3e37f6263 (patch) | |
tree | 817a80fa89d17305a47a3e4e4012d36ae6cac36c /drivers/pci/hotplug/pciehp_core.c | |
parent | 3c78bc61f5ef3bc87e7f94f67ec737d2273f120b (diff) |
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>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_core.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) | |||
266 | rc = init_slot(ctrl); | 266 | rc = init_slot(ctrl); |
267 | if (rc) { | 267 | if (rc) { |
268 | if (rc == -EBUSY) | 268 | if (rc == -EBUSY) |
269 | ctrl_warn(ctrl, "Slot already registered by another " | 269 | ctrl_warn(ctrl, "Slot already registered by another hotplug driver\n"); |
270 | "hotplug driver\n"); | ||
271 | else | 270 | else |
272 | ctrl_err(ctrl, "Slot initialization failed\n"); | 271 | ctrl_err(ctrl, "Slot initialization failed\n"); |
273 | goto err_out_release_ctlr; | 272 | goto err_out_release_ctlr; |