summaryrefslogtreecommitdiff
path: root/drivers/of/unittest.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2023-08-24 17:17:34 -0500
committerRob Herring <robh@kernel.org>2023-08-28 10:45:16 -0500
commit5a7319b967b66969e3fff7b91bdfbcd9acd969ac (patch)
treee778ecbc8b91ec45b14e52b5b3fa700f8e606b82 /drivers/of/unittest.c
parent911325d2324e320456351ea5d165f31aa3b222d1 (diff)
of: unittest: Fix of_unittest_pci_node() kconfig dependencies
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: 26409dd04589 ("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>
Diffstat (limited to 'drivers/of/unittest.c')
-rw-r--r--drivers/of/unittest.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c
index 9c0f352cb241..ad2b7879cc67 100644
--- a/drivers/of/unittest.c
+++ b/drivers/of/unittest.c
@@ -3799,14 +3799,6 @@ err_unlock:
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)