github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 12:03:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

of: unittest: Fix of_unittest_pci_node() kconfig dependencies

Browse Source 
of_unittest_pci_node test depends on both CONFIG_PCI_DYNAMIC_OF_NODES
and CONFIG_OF_OVERLAY. Move the test into the existing
CONFIG_OF_OVERLAY ifdef and rework the CONFIG_PCI_DYNAMIC_OF_NODES
dependency to use IS_ENABLED() instead. This reduces the combinations to
build.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202308241954.oRNfVqmB-lkp@intel.com/
Fixes: 26409dd045 ("of: unittest: Add pci_dt_testdrv pci driver")
Cc: Lizhi Hou <lizhi.hou@amd.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Link: https://lore.kernel.org/r/20230824221743.1581707-1-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
This commit is contained in:
Rob Herring 2023-08-24 17:17:34 -05:00
parent 911325d232
commit 5a7319b967
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/of/unittest.c
View File

@ -3799,14 +3799,6 @@ static __init void of_unittest_overlay_high_level(void)
mutex_unlock(&of_mutex);
}
#else
static inline __init void of_unittest_overlay_high_level(void) {}
#endif
#ifdef CONFIG_PCI_DYNAMIC_OF_NODES
static int of_unittest_pci_dev_num;
static int of_unittest_pci_child_num;
@ -3954,6 +3946,9 @@ static void __init of_unittest_pci_node(void)
struct pci_dev *pdev = NULL;
int rc;
if (!IS_ENABLED(CONFIG_PCI_DYNAMIC_OF_NODES))
return;
rc = pci_register_driver(&testdrv_driver);
unittest(!rc, "Failed to register pci test driver; rc = %d\n", rc);
if (rc)
@ -3987,7 +3982,10 @@ static void __init of_unittest_pci_node(void)
pci_dev_put(pdev);
}
#else
static void __init of_unittest_pci_node(void) { }
static inline __init void of_unittest_overlay_high_level(void) {}
static inline __init void of_unittest_pci_node(void) { }
#endif
static int __init of_unittest(void)