From 63eceba1e3a4fad6a346ba804d1b9be43898abb9 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 24 Jul 2003 18:37:36 -0700 Subject: [PATCH] [SPARC64]: Use domain in naming PCI buses. --- arch/sparc64/kernel/pci.c | 6 ++++++ 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 e7775e522bb85..61974099b1850 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 c276200453a3a..2dbd268962e69 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. */ -- 2.53.0