Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 227f0647 authored by Ryan Desfosses's avatar Ryan Desfosses Committed by Bjorn Helgaas
Browse files

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: default avatarRyan Desfosses <ryan@desfo.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 3c78bc61

drivers/pci/access.c

+1 −4
Original line number Diff line number Diff line
@@ -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))

drivers/pci/host/pcie-rcar.c

+4 −6
Original line number Diff line number Diff line
@@ -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);

drivers/pci/hotplug/acpiphp_glue.c

+2 −4
Original line number Diff line number Diff line
@@ -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. */

	}

drivers/pci/hotplug/cpqphp_core.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

	}

drivers/pci/hotplug/ibmphp_core.c

+4 −8
Original line number Diff line number Diff line
@@ -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;

	}