diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-07-24 18:37:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-07-24 18:37:36 -0700 |
| commit | 63eceba1e3a4fad6a346ba804d1b9be43898abb9 (patch) | |
| tree | 9160138f2cd2871838bdb5fb8ee99e15be28ddc7 | |
| parent | 9073380e17c4f029071c0d92d143ce55162a2a03 (diff) | |
[SPARC64]: Use domain in naming PCI buses.
| -rw-r--r-- | arch/sparc64/kernel/pci.c | 6 | ||||
| -rw-r--r-- | include/asm-sparc64/pci.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index e7775e522bb8..61974099b185 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c @@ -798,6 +798,12 @@ int pci_domain_nr(struct pci_bus *pbus) return ret; } +int pci_name_bus(char *name, struct pci_bus *bus) +{ + sprintf(name, "%04x:%02x", pci_domain_nr(bus), bus->number); + return 0; +} + int pcibios_prep_mwi(struct pci_dev *dev) { /* We set correct PCI_CACHE_LINE_SIZE register values for every diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h index c276200453a3..2dbd268962e6 100644 --- a/include/asm-sparc64/pci.h +++ b/include/asm-sparc64/pci.h @@ -190,13 +190,7 @@ pci_dac_dma_sync_single(struct pci_dev *pdev, dma64_addr_t dma_addr, size_t len, /* Return the index of the PCI controller for device PDEV. */ extern int pci_domain_nr(struct pci_bus *bus); - -/* Set the name of the bus as it appears in /proc/bus/pci */ -static inline int pci_name_bus(char *name, struct pci_bus *bus) -{ - sprintf(name, "%02x", bus->number); - return 0; -} +extern int pci_name_bus(char *name, struct pci_bus *bus); /* Platform support for /proc/bus/pci/X/Y mmap()s. */ |