From: Ian Abbott <abbotti@mev.co.uk>
Date: Mon, 7 Aug 2006 18:02:38 +0000 (+0000)
Subject: Used pci_name() when printing PCI device location.
X-Git-Tag: r0_7_72~18
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=58d1c18dab4d7223aed0b06729c0ee1ad7c1d6b6;p=comedi.git

Used pci_name() when printing PCI device location.
---

diff --git a/comedi/drivers/amplc_dio200.c b/comedi/drivers/amplc_dio200.c
index 91016fc8..336ce40f 100644
--- a/comedi/drivers/amplc_dio200.c
+++ b/comedi/drivers/amplc_dio200.c
@@ -1323,9 +1323,7 @@ dio200_attach(comedi_device *dev,comedi_devconfig *it)
 	if (thisboard->bustype == isa_bustype) {
 		printk("(base %#lx) ", iobase);
 	} else {
-		printk("(pci %02x:%02x.%x) ", pci_dev->bus->number,
-				PCI_SLOT(pci_dev->devfn),
-				PCI_FUNC(pci_dev->devfn));
+		printk("(pci %s) ", pci_name(pci_dev));
 	}
 	if (irq) {
 		printk("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
diff --git a/comedi/drivers/amplc_pc236.c b/comedi/drivers/amplc_pc236.c
index ac3eefe1..177a88b4 100644
--- a/comedi/drivers/amplc_pc236.c
+++ b/comedi/drivers/amplc_pc236.c
@@ -306,9 +306,7 @@ static int pc236_attach(comedi_device *dev,comedi_devconfig *it)
 	if (thisboard->bustype == isa_bustype) {
 		printk("(base %#lx) ", iobase);
 	} else {
-		printk("(pci %02x:%02x.%x) ", pci_dev->bus->number,
-				PCI_SLOT(pci_dev->devfn),
-				PCI_FUNC(pci_dev->devfn));
+		printk("(pci %s) ", pci_name(pci_dev));
 	}
 	if (irq) {
 		printk("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
diff --git a/comedi/drivers/amplc_pc263.c b/comedi/drivers/amplc_pc263.c
index abf6020b..50b75da1 100644
--- a/comedi/drivers/amplc_pc263.c
+++ b/comedi/drivers/amplc_pc263.c
@@ -264,9 +264,7 @@ static int pc263_attach(comedi_device *dev,comedi_devconfig *it)
 	if (thisboard->bustype == isa_bustype) {
 		printk("(base %#lx) ", iobase);
 	} else {
-		printk("(pci %02x:%02x.%x) ", pci_dev->bus->number,
-				PCI_SLOT(pci_dev->devfn),
-				PCI_FUNC(pci_dev->devfn));
+		printk("(pci %s) ", pci_name(pci_dev));
 	}
 	
 	printk("attached\n");
diff --git a/comedi/drivers/amplc_pci224.c b/comedi/drivers/amplc_pci224.c
index 364acdb1..bb9fcc08 100644
--- a/comedi/drivers/amplc_pci224.c
+++ b/comedi/drivers/amplc_pci224.c
@@ -1487,9 +1487,7 @@ pci224_attach(comedi_device *dev,comedi_devconfig *it)
 	}
 
 	printk(KERN_INFO "comedi%d: %s ", dev->minor, dev->board_name);
-	printk("(pci %02x:%02x.%x) ", pci_dev->bus->number,
-			PCI_SLOT(pci_dev->devfn),
-			PCI_FUNC(pci_dev->devfn));
+	printk("(pci %s) ", pci_name(pci_dev));
 	if (irq) {
 		printk("(irq %u%s) ", irq, (dev->irq ? "" : " UNAVAILABLE"));
 	} else {