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

Commit c7dabef8 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Jesse Barnes
Browse files

vsprintf: use %pR, %pr instead of %pRt, %pRf 

Jesse accidentally applied v1 [1] of the patchset instead of v2 [2].  This
is the diff between v1 and v2.

The changes in this patch are:
    - tidied vsprintf stack buffer to shrink and compute size more
      accurately
    - use %pR for decoding and %pr for "raw" (with type and flags) instead
      of adding %pRt and %pRf

[1] http://lkml.org/lkml/2009/10/6/491
[2] http://lkml.org/lkml/2009/10/13/441



Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 4fd8bdc5

arch/ia64/pci/pci.c

+7 −4
Original line number Diff line number Diff line
@@ -298,18 +298,19 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data) 
	window->offset = offset;



	if (insert_resource(root, &window->resource)) {

		dev_err(&info->bridge->dev, "can't allocate %pRt\n",

		dev_err(&info->bridge->dev,

			"can't allocate host bridge window %pR\n",

			&window->resource);

	} else {

		if (offset)

			dev_info(&info->bridge->dev, "host bridge window: %pRt "

			dev_info(&info->bridge->dev, "host bridge window %pR "

				 "(PCI address [%#llx-%#llx])\n",

				 &window->resource,

				 window->resource.start - offset,

				 window->resource.end - offset);

		else

			dev_info(&info->bridge->dev,

				 "host bridge window: %pRt\n",

				 "host bridge window %pR\n",

				 &window->resource);

	}
@@ -330,7 +331,9 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) 
		    (res->end - res->start < 16))

			continue;

		if (j >= PCI_BUS_NUM_RESOURCES) {

			dev_warn(&bus->dev, "ignoring %pRf (no space)\n", res);

			dev_warn(&bus->dev,

				 "ignoring host bridge window %pR (no space)\n",

				 res);

			continue;

		}

		bus->resource[j++] = res;

arch/x86/pci/acpi.c

+4 −3
Original line number Diff line number Diff line
@@ -108,18 +108,19 @@ setup_resource(struct acpi_resource *acpi_res, void *data) 
	res->child = NULL;



	if (insert_resource(root, res)) {

		dev_err(&info->bridge->dev, "can't allocate %pRt\n", res);

		dev_err(&info->bridge->dev,

			"can't allocate host bridge window %pR\n", res);

	} else {

		info->bus->resource[info->res_num] = res;

		info->res_num++;

		if (addr.translation_offset)

			dev_info(&info->bridge->dev, "host bridge window: %pRt "

			dev_info(&info->bridge->dev, "host bridge window %pR "

				 "(PCI address [%#llx-%#llx])\n",

				 res, res->start - addr.translation_offset,

				 res->end - addr.translation_offset);

		else

			dev_info(&info->bridge->dev,

				 "host bridge window: %pRt\n", res);

				 "host bridge window %pR\n", res);

	}

	return AE_OK;

}

arch/x86/pci/i386.c

+6 −5
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
					continue;

				if (!r->start ||

				    pci_claim_resource(dev, idx) < 0) {

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

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

					/*

					 * Something is wrong with the region.

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

				disabled = !(command & PCI_COMMAND_MEMORY);

			if (pass == disabled) {

				dev_dbg(&dev->dev, "%pRf (d=%d, p=%d)\n", r,

					disabled, pass);

				dev_dbg(&dev->dev,

					"BAR %d: claiming %pr (d=%d, p=%d)\n",

					idx, r, disabled, pass);

				if (pci_claim_resource(dev, idx) < 0) {

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

					dev_info(&dev->dev, "BAR %d: can't claim %pR\n", idx, r);

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

					r->end -= r->start;

					r->start = 0;
@@ -180,7 +181,7 @@ static void __init pcibios_allocate_resources(int pass) 
				/* Turn the ROM off, leave the resource region,

				 * but keep it unregistered. */

				u32 reg;

				dev_dbg(&dev->dev, "disabling ROM %pRt\n", r);

				dev_dbg(&dev->dev, "disabling ROM %pR\n", r);

				r->flags &= ~IORESOURCE_ROM_ENABLE;

				pci_read_config_dword(dev,

						dev->rom_base_reg, &reg);

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1713,7 +1713,7 @@ static int __pci_request_region(struct pci_dev *pdev, int bar, const char *res_n 
	return 0;



err_out:

	dev_warn(&pdev->dev, "BAR %d: can't reserve %pRt\n", bar,

	dev_warn(&pdev->dev, "BAR %d: can't reserve %pR\n", bar,

		 &pdev->resource[bar]);

	return -EBUSY;

}

drivers/pci/probe.c

+9 −8
Original line number Diff line number Diff line
@@ -225,12 +225,13 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
		if (!sz64)

			goto fail;



		res->flags |= IORESOURCE_MEM_64;



		if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) {

			dev_err(&dev->dev, "can't handle 64-bit BAR\n");

			goto fail;

		} else if ((sizeof(resource_size_t) < 8) && l) {

		}



		res->flags |= IORESOURCE_MEM_64;

		if ((sizeof(resource_size_t) < 8) && l) {

			/* Address above 32-bit boundary; disable the BAR */

			pci_write_config_dword(dev, pos, 0);

			pci_write_config_dword(dev, pos + 4, 0);
@@ -239,7 +240,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
		} else {

			res->start = l64;

			res->end = l64 + sz64;

			dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pRt\n",

			dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n",

				   pos, res);

		}

	} else {
@@ -251,7 +252,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
		res->start = l;

		res->end = l + sz;



		dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pRt\n", pos, res);

		dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res);

	}



 out:
@@ -319,7 +320,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
			res->start = base;

		if (!res->end)

			res->end = limit + 0xfff;

		dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res);

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

	}



	res = child->resource[1];
@@ -331,7 +332,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;

		res->start = base;

		res->end = limit + 0xfffff;

		dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res);

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

	}



	res = child->resource[2];
@@ -370,7 +371,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) 
			res->flags |= IORESOURCE_MEM_64;

		res->start = base;

		res->end = limit + 0xfffff;

		dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res);

		dev_printk(KERN_DEBUG, &dev->dev, "  bridge window %pR\n", res);

	}

}