+ /* + * If support CONFIG_PCI_DOMAINS_GENERIC, use + * pci_host_assign_domain_nr() to update domain + * number. + */ + host->domain = domain; + pci_host_assign_domain_nr(host);I think it's a bit confusing that there's another "host->domain =" assignment buried inside pci_host_assign_domain_nr(), so the first assignment is overwritten when CONFIG_PCI_DOMAINS_GENERIC is set. Can you do something like this instead: int pci_host_assign_domain_nr(struct pci_host_bridge *host, int domain) { #ifdef CONFIG_PCI_DOMAINS_GENERIC host->domain = pci_assign_domain_nr(host->dev.parent); #else host->domain = domain; #endif } Then the alternatives (CONFIG_PCI_DOMAINS_GENERIC=y and CONFIG_PCI_DOMAINS_GENERIC being unset) are close together and right at the #ifdef CONFIG_PCI_DOMAINS_GENERIC, so no extra comments are needed.
OK, I would use #ifdef to update pci_host_assign_domain_nr(), and I would drop the last patch [PATCH v9 30/30] PCI: Clean up CONFIG_PCI_DOMAINS_GENERIC. Thanks! Yijing.
Bjorn .
-- Thanks! Yijing -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
