| Message ID | a21882288c4664cc983a5741e8cbf6d59abacd46.1524582822.git.jan.kiszka@siemens.com |
|---|---|
| State | Superseded |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: leak fixes, removable generic PCI host, assorted stuff | expand |
On Tue, Apr 24, 2018 at 05:13:37PM +0200, Jan Kiszka wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > The only user of that function is of_pci_bus_find_domain_nr. Pure > cleanup. "The only user of pci_get_new_domain_nr() is of_pci_bus_find_domain_nr(). Since they are defined in the same compilation unit, 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> > --- > drivers/pci/pci.c | 6 ++---- > include/linux/pci.h | 3 --- > 2 files changed, 2 insertions(+), 7 deletions(-) Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index e597655a5643..695c2bb4e853 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -5702,15 +5702,14 @@ static void pci_no_domains(void) > #endif > } > > -#ifdef CONFIG_PCI_DOMAINS > +#ifdef CONFIG_PCI_DOMAINS_GENERIC > 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); > } > > -#ifdef CONFIG_PCI_DOMAINS_GENERIC > static int of_pci_bus_find_domain_nr(struct device *parent) > { > 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); > } > #endif > -#endif > > /** > * pci_ext_cfg_avail - can we access extended PCI config space? > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 73178a2fcee0..963232a6cd2e 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -1510,12 +1510,10 @@ void pci_cfg_access_unlock(struct pci_dev *dev); > */ > #ifdef CONFIG_PCI_DOMAINS > extern int pci_domains_supported; > -int pci_get_new_domain_nr(void); > #else > enum { pci_domains_supported = 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_get_new_domain_nr(void) { return -ENOSYS; } > #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 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_pf(d) (false) > -- > 2.13.6 >
On 2018-04-25 18:27, Lorenzo Pieralisi wrote: > On Tue, Apr 24, 2018 at 05:13:37PM +0200, Jan Kiszka wrote: >> From: Jan Kiszka <jan.kiszka@siemens.com> >> >> The only user of that function is of_pci_bus_find_domain_nr. Pure >> cleanup. > > "The only user of pci_get_new_domain_nr() is of_pci_bus_find_domain_nr(). > Since they are defined in the same compilation unit, > pci_get_new_domain_nr() can be made static, which also simplifies > preprocessor conditionals. > > No functional change intended." > Thanks, wording adopted for v2. Jan >> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> >> --- >> drivers/pci/pci.c | 6 ++---- >> include/linux/pci.h | 3 --- >> 2 files changed, 2 insertions(+), 7 deletions(-) > > Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > >> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c >> index e597655a5643..695c2bb4e853 100644 >> --- a/drivers/pci/pci.c >> +++ b/drivers/pci/pci.c >> @@ -5702,15 +5702,14 @@ static void pci_no_domains(void) >> #endif >> } >> >> -#ifdef CONFIG_PCI_DOMAINS >> +#ifdef CONFIG_PCI_DOMAINS_GENERIC >> 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); >> } >> >> -#ifdef CONFIG_PCI_DOMAINS_GENERIC >> static int of_pci_bus_find_domain_nr(struct device *parent) >> { >> 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); >> } >> #endif >> -#endif >> >> /** >> * pci_ext_cfg_avail - can we access extended PCI config space? >> diff --git a/include/linux/pci.h b/include/linux/pci.h >> index 73178a2fcee0..963232a6cd2e 100644 >> --- a/include/linux/pci.h >> +++ b/include/linux/pci.h >> @@ -1510,12 +1510,10 @@ void pci_cfg_access_unlock(struct pci_dev *dev); >> */ >> #ifdef CONFIG_PCI_DOMAINS >> extern int pci_domains_supported; >> -int pci_get_new_domain_nr(void); >> #else >> enum { pci_domains_supported = 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_get_new_domain_nr(void) { return -ENOSYS; } >> #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 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_pf(d) (false) >> -- >> 2.13.6 >>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index e597655a5643..695c2bb4e853 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5702,15 +5702,14 @@ static void pci_no_domains(void) #endif } -#ifdef CONFIG_PCI_DOMAINS +#ifdef CONFIG_PCI_DOMAINS_GENERIC 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); } -#ifdef CONFIG_PCI_DOMAINS_GENERIC static int of_pci_bus_find_domain_nr(struct device *parent) { 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); } #endif -#endif /** * pci_ext_cfg_avail - can we access extended PCI config space? diff --git a/include/linux/pci.h b/include/linux/pci.h index 73178a2fcee0..963232a6cd2e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1510,12 +1510,10 @@ void pci_cfg_access_unlock(struct pci_dev *dev); */ #ifdef CONFIG_PCI_DOMAINS extern int pci_domains_supported; -int pci_get_new_domain_nr(void); #else enum { pci_domains_supported = 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_get_new_domain_nr(void) { return -ENOSYS; } #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 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_pf(d) (false)