leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Make pci_get_new_domain_nr() static

Browse Source 
The only user of pci_get_new_domain_nr() is of_pci_bus_find_domain_nr().
Since they are defined in the same file, pci_get_new_domain_nr() can be
made static, which also simplifies preprocessor conditionals.

No functional change intended.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
This commit is contained in:
Jan Kiszka
2018-05-15 11:07:00 +02:00
committed by Bjorn Helgaas
parent 60cc43fc88
commit ae07b78688
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/pci.c
View File

@@ -5702,15 +5702,14 @@ static void pci_no_domains(void)
#endif #endif
} }
#ifdef CONFIG_PCI_DOMAINS #ifdef CONFIG_PCI_DOMAINS_GENERIC
static atomic_t __domain_nr = ATOMIC_INIT(-1); static atomic_t __domain_nr = ATOMIC_INIT(-1);
int pci_get_new_domain_nr(void) static int pci_get_new_domain_nr(void)
{ {
return atomic_inc_return(&__domain_nr); return atomic_inc_return(&__domain_nr);
} }
#ifdef CONFIG_PCI_DOMAINS_GENERIC
static int of_pci_bus_find_domain_nr(struct device *parent) static int of_pci_bus_find_domain_nr(struct device *parent)
{ {
static int use_dt_domains = -1; static int use_dt_domains = -1;
@@ -5765,7 +5764,6 @@ int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent)
acpi_pci_bus_find_domain_nr(bus); acpi_pci_bus_find_domain_nr(bus);
} }
#endif #endif
#endif
/** /**
* pci_ext_cfg_avail - can we access extended PCI config space? * pci_ext_cfg_avail - can we access extended PCI config space?

3
include/linux/pci.h
View File

@@ -1510,12 +1510,10 @@ void pci_cfg_access_unlock(struct pci_dev *dev);
*/ */
#ifdef CONFIG_PCI_DOMAINS #ifdef CONFIG_PCI_DOMAINS
extern int pci_domains_supported; extern int pci_domains_supported;
int pci_get_new_domain_nr(void);
#else #else
enum { pci_domains_supported = 0 }; enum { pci_domains_supported = 0 };
static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
static inline int pci_proc_domain(struct pci_bus *bus) { return 0; } static inline int pci_proc_domain(struct pci_bus *bus) { return 0; }
static inline int pci_get_new_domain_nr(void) { return -ENOSYS; }
#endif /* CONFIG_PCI_DOMAINS */ #endif /* CONFIG_PCI_DOMAINS */
/* /*
@@ -1670,7 +1668,6 @@ static inline struct pci_dev *pci_get_domain_bus_and_slot(int domain,
static inline int pci_domain_nr(struct pci_bus *bus) { return 0; } static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; } static inline struct pci_dev *pci_dev_get(struct pci_dev *dev) { return NULL; }
static inline int pci_get_new_domain_nr(void) { return -ENOSYS; }
#define dev_is_pci(d) (false) #define dev_is_pci(d) (false)
#define dev_is_pf(d) (false) #define dev_is_pf(d) (false)