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

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

x86/PCI: follow lspci device/vendor style 



Use "[%04x:%04x]" for PCI vendor/device IDs to follow the format
used by lspci(8).

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

arch/x86/pci/irq.c

+4 −4
Original line number Diff line number Diff line
@@ -493,7 +493,7 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq 
	if (pirq <= 4)

		irq = read_config_nybble(router, 0x56, pirq - 1);

	dev_info(&dev->dev,

		 "AMD756: dev [%04x/%04x], router PIRQ %d get IRQ %d\n",

		 "AMD756: dev [%04x:%04x], router PIRQ %d get IRQ %d\n",

		 dev->vendor, dev->device, pirq, irq);

	return irq;

}
@@ -501,7 +501,7 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq 
static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)

{

	dev_info(&dev->dev,

		 "AMD756: dev [%04x/%04x], router PIRQ %d set IRQ %d\n",

		 "AMD756: dev [%04x:%04x], router PIRQ %d set IRQ %d\n",

		 dev->vendor, dev->device, pirq, irq);

	if (pirq <= 4)

		write_config_nybble(router, 0x56, pirq - 1, irq);
@@ -823,7 +823,7 @@ static void __init pirq_find_router(struct irq_router *r) 
	r->get = NULL;

	r->set = NULL;



	DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",

	DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for [%04x:%04x]\n",

	    rt->rtr_vendor, rt->rtr_device);



	pirq_router_dev = pci_get_bus_and_slot(rt->rtr_bus, rt->rtr_devfn);
@@ -843,7 +843,7 @@ static void __init pirq_find_router(struct irq_router *r) 
			h->probe(r, pirq_router_dev, pirq_router_dev->device))

			break;

	}

	dev_info(&pirq_router_dev->dev, "%s IRQ router [%04x/%04x]\n",

	dev_info(&pirq_router_dev->dev, "%s IRQ router [%04x:%04x]\n",

		 pirq_router.name,

		 pirq_router_dev->vendor, pirq_router_dev->device);