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

PCI: print resources consistently with %pR 



No functional change; just print resources in the conventional style.

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

drivers/pci/hotplug/pciehp_hpc.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -832,9 +832,8 @@ static inline void dbg_ctrl(struct controller *ctrl) 
	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {

	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {

		if (!pci_resource_len(pdev, i))

		if (!pci_resource_len(pdev, i))

			continue;

			continue;

		ctrl_info(ctrl, "  PCI resource [%d]     : 0x%llx@0x%llx\n",

		ctrl_info(ctrl, "  PCI resource [%d]     : %pR\n",

			  i, (unsigned long long)pci_resource_len(pdev, i),

			  i, &pdev->resource[i]);

			  (unsigned long long)pci_resource_start(pdev, i));

	}

	}

	ctrl_info(ctrl, "Slot Capabilities      : 0x%08x\n", ctrl->slot_cap);

	ctrl_info(ctrl, "Slot Capabilities      : 0x%08x\n", ctrl->slot_cap);

	ctrl_info(ctrl, "  Physical Slot Number : %d\n", PSN(ctrl));

	ctrl_info(ctrl, "  Physical Slot Number : %d\n", PSN(ctrl));

drivers/pci/ioapic.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -31,9 +31,9 @@ static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent) 
	acpi_status status;

	acpi_status status;

	unsigned long long gsb;

	unsigned long long gsb;

	struct ioapic *ioapic;

	struct ioapic *ioapic;

	u64 addr;

	int ret;

	int ret;

	char *type;

	char *type;

	struct resource *res;





	handle = DEVICE_ACPI_HANDLE(&dev->dev);

	handle = DEVICE_ACPI_HANDLE(&dev->dev);

	if (!handle)

	if (!handle)
@@ -69,13 +69,12 @@ static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent) 
	if (pci_request_region(dev, 0, type))

	if (pci_request_region(dev, 0, type))

		goto exit_disable;

		goto exit_disable;





	addr = pci_resource_start(dev, 0);

	res = &dev->resource[0];

	if (acpi_register_ioapic(ioapic->handle, addr, ioapic->gsi_base))

	if (acpi_register_ioapic(ioapic->handle, res->start, ioapic->gsi_base))

		goto exit_release;

		goto exit_release;





	pci_set_drvdata(dev, ioapic);

	pci_set_drvdata(dev, ioapic);

	dev_info(&dev->dev, "%s at %#llx, GSI %u\n", type, addr,

	dev_info(&dev->dev, "%s at %pR, GSI %u\n", type, res, ioapic->gsi_base);

		 ioapic->gsi_base);

	return 0;

	return 0;





exit_release:

exit_release:

drivers/pcmcia/rsrc_nonstatic.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -867,10 +867,8 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s) 
			if (res == &ioport_resource)

			if (res == &ioport_resource)

				continue;

				continue;

			dev_printk(KERN_INFO, &s->cb_dev->dev,

			dev_printk(KERN_INFO, &s->cb_dev->dev,

				   "pcmcia: parent PCI bridge I/O "

				   "pcmcia: parent PCI bridge window: %pR\n",

				   "window: 0x%llx - 0x%llx\n",

				   res);

				   (unsigned long long)res->start,

				   (unsigned long long)res->end);

			if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))

			if (!adjust_io(s, ADD_MANAGED_RESOURCE, res->start, res->end))

				done |= IORESOURCE_IO;

				done |= IORESOURCE_IO;
@@ -880,10 +878,8 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s) 
			if (res == &iomem_resource)

			if (res == &iomem_resource)

				continue;

				continue;

			dev_printk(KERN_INFO, &s->cb_dev->dev,

			dev_printk(KERN_INFO, &s->cb_dev->dev,

				   "pcmcia: parent PCI bridge Memory "

				   "pcmcia: parent PCI bridge window: %pR\n",

				   "window: 0x%llx - 0x%llx\n",

				   res);

				   (unsigned long long)res->start,

				   (unsigned long long)res->end);

			if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))

			if (!adjust_memory(s, ADD_MANAGED_RESOURCE, res->start, res->end))

				done |= IORESOURCE_MEM;

				done |= IORESOURCE_MEM;

		}

		}