Used pci_name() when printing PCI device location.

diff --git a/comedi/drivers/amplc_dio200.c b/comedi/drivers/amplc_dio200.c
index 91016fc8969f4cd09a247c3450816ebd29b7ac75..336ce40f76710ab3e9190f87530c9aace0aa324d 100644 (file)
--- 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 ac3eefe1d6bb8488d15a2ee03bfcaeb3e696a0b0..177a88b4871f6bb1b70b11cf01edd1d55d100e06 100644 (file)
--- 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 abf6020b84f58d5d82690f4f9664921b3ae26e05..50b75da18910118049ddd14b72d2205136569838 100644 (file)
--- 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 364acdb165c6e24aa398ade5657091c5a4ed63df..bb9fcc0855051e6fe71408c54cdca7665402bff3 100644 (file)
--- 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 {