| Message ID | 1465588519-11334-8-git-send-email-tn@semihalf.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Jun 10, 2016 at 09:55:15PM +0200, Tomasz Nowicki wrote: > pci_bus_find_domain_nr() retrieves the host bridge domain number in a DT > specific way. Factor our pci_bus_find_domain_nr() in a separate DT s/our/out > function (ie of_pci_bus_find_domain_nr()) so that DT code is self > contained, paving the way for retrieving domain number in > pci_bus_find_domain_nr() with additional firmware methods (ie ACPI). > > Signed-off-by: Tomasz Nowicki <tn@semihalf.com> > --- > drivers/pci/pci.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Reviewed-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c > index b9a7833..327828d 100644 > --- a/drivers/pci/pci.c > +++ b/drivers/pci/pci.c > @@ -4941,7 +4941,7 @@ int pci_get_new_domain_nr(void) > } > > #ifdef CONFIG_PCI_DOMAINS_GENERIC > -int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) > +static int of_pci_bus_find_domain_nr(struct device *parent) > { > static int use_dt_domains = -1; > int domain = -1; > @@ -4987,6 +4987,11 @@ int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) > > return domain; > } > + > +int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) > +{ > + return of_pci_bus_find_domain_nr(parent); > +} > #endif > #endif > > -- > 1.9.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index b9a7833..327828d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4941,7 +4941,7 @@ int pci_get_new_domain_nr(void) } #ifdef CONFIG_PCI_DOMAINS_GENERIC -int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) +static int of_pci_bus_find_domain_nr(struct device *parent) { static int use_dt_domains = -1; int domain = -1; @@ -4987,6 +4987,11 @@ int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) return domain; } + +int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent) +{ + return of_pci_bus_find_domain_nr(parent); +} #endif #endif
pci_bus_find_domain_nr() retrieves the host bridge domain number in a DT specific way. Factor our pci_bus_find_domain_nr() in a separate DT function (ie of_pci_bus_find_domain_nr()) so that DT code is self contained, paving the way for retrieving domain number in pci_bus_find_domain_nr() with additional firmware methods (ie ACPI). Signed-off-by: Tomasz Nowicki <tn@semihalf.com> --- drivers/pci/pci.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)