Commit 011fec74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Un-break printk strings in x86 PCI probing code 



Breaking lines due to some imaginary problem with a long line length is
often stupid and wrong, but never more so when it splits a string that
is printed out into multiple lines.  This really ended up making it much
harder to find where some error strings were printed out, because a
simple 'grep' didn't work.

I'm sure there is tons more of this particular idiocy hiding in other
places, but this particular case hit me once more last week. So fix it.

Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bef69ea0

arch/x86/pci/i386.c

+3 −6
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
				pr = pci_find_parent_resource(dev, r);

				if (!r->start || !pr ||

				    request_resource(pr, r) < 0) {

					dev_err(&dev->dev, "BAR %d: can't "

						"allocate resource\n", idx);

					dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);

					/*

					 * Something is wrong with the region.

					 * Invalidate the resource to prevent
@@ -164,15 +163,13 @@ static void __init pcibios_allocate_resources(int pass) 
			else

				disabled = !(command & PCI_COMMAND_MEMORY);

			if (pass == disabled) {

				dev_dbg(&dev->dev, "resource %#08llx-%#08llx "

					"(f=%lx, d=%d, p=%d)\n",

				dev_dbg(&dev->dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n",

					(unsigned long long) r->start,

					(unsigned long long) r->end,

					r->flags, disabled, pass);

				pr = pci_find_parent_resource(dev, r);

				if (!pr || request_resource(pr, r) < 0) {

					dev_err(&dev->dev, "BAR %d: can't "

						"allocate resource\n", idx);

					dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);

					/* We'll assign a new address later */

					r->end -= r->start;

					r->start = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE