mmc: sdhci-of-aspeed: test: Use kunit_test_suite() macro

The kunit_test_suite() macro is no-longer incompatible with module_add,
so its use can be reinstated.

Since this fixes parsing with builtins and kunit_tool, also enable the
test by default when KUNIT_ALL_TESTS is enabled.

The test can now be run via kunit_tool with:
	./tools/testing/kunit/kunit.py run --arch=x86_64 \
	--kconfig_add CONFIG_OF=y --kconfig_add CONFIG_OF_ADDRESS=y \
	--kconfig_add CONFIG_MMC=y --kconfig_add CONFIG_MMC_SDHCI=y \
	--kconfig_add CONFIG_MMC_SDHCI_PLTFM=y \
	--kconfig_add CONFIG_MMC_SDHCI_OF_ASPEED=y \
	'sdhci-of-aspeed'

(It may be worth adding a .kunitconfig at some point, as there are
enough dependencies to make that command scarily long.)

Acked-by: Daniel Latypov <dlatypov@google.com>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index d6144978e32d5d977b65a4cf8c3f0f9cef4f34b1..10c563999d3dab719e1c58f47399ed99909ba5f7 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -169,8 +169,9 @@ config MMC_SDHCI_OF_ASPEED
          If unsure, say N.
 
 config MMC_SDHCI_OF_ASPEED_TEST
-       bool "Tests for the ASPEED SDHCI driver"
-       depends on MMC_SDHCI_OF_ASPEED && KUNIT=y
+       bool "Tests for the ASPEED SDHCI driver" if !KUNIT_ALL_TESTS
+       depends on MMC_SDHCI_OF_ASPEED && KUNIT
+       default KUNIT_ALL_TESTS
        help
          Enable KUnit tests for the ASPEED SDHCI driver. Select this
          option only if you will boot the kernel for the purpose of running

diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c
index 1ed4f86291f29e36aee667f40014f2b550c7eb3f..ecb502606c539b24f5497bde74ee2940d5433ab0 100644 (file)
--- a/drivers/mmc/host/sdhci-of-aspeed-test.c
+++ b/drivers/mmc/host/sdhci-of-aspeed-test.c
@@ -96,10 +96,4 @@ static struct kunit_suite aspeed_sdhci_test_suite = {
        .test_cases = aspeed_sdhci_test_cases,
 };
 
-static struct kunit_suite *aspeed_sdc_test_suite_array[] = {
-       &aspeed_sdhci_test_suite,
-       NULL,
-};
-
-static struct kunit_suite **aspeed_sdc_test_suites
-       __used __section(".kunit_test_suites") = aspeed_sdc_test_suite_array;
+kunit_test_suite(aspeed_sdhci_test_suite);

diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index 6e4e132903a6346bf4dd9259233bf515c3c587bd..ba6677bf7372cadccfb33a18d355ccb505408f0e 100644 (file)
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -606,25 +606,6 @@ static struct platform_driver aspeed_sdc_driver = {
 
 #if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
 #include "sdhci-of-aspeed-test.c"
-
-static inline int aspeed_sdc_tests_init(void)
-{
-       return __kunit_test_suites_init(aspeed_sdc_test_suites);
-}
-
-static inline void aspeed_sdc_tests_exit(void)
-{
-       __kunit_test_suites_exit(aspeed_sdc_test_suites);
-}
-#else
-static inline int aspeed_sdc_tests_init(void)
-{
-       return 0;
-}
-
-static inline void aspeed_sdc_tests_exit(void)
-{
-}
 #endif
 
 static int __init aspeed_sdc_init(void)
@@ -637,18 +618,7 @@ static int __init aspeed_sdc_init(void)
 
        rc = platform_driver_register(&aspeed_sdc_driver);
        if (rc < 0)
-               goto cleanup_sdhci;
-
-       rc = aspeed_sdc_tests_init();
-       if (rc < 0) {
-               platform_driver_unregister(&aspeed_sdc_driver);
-               goto cleanup_sdhci;
-       }
-
-       return 0;
-
-cleanup_sdhci:
-       platform_driver_unregister(&aspeed_sdhci_driver);
+               platform_driver_unregister(&aspeed_sdhci_driver);
 
        return rc;
 }
@@ -656,8 +626,6 @@ module_init(aspeed_sdc_init);
 
 static void __exit aspeed_sdc_exit(void)
 {
-       aspeed_sdc_tests_exit();
-
        platform_driver_unregister(&aspeed_sdc_driver);
        platform_driver_unregister(&aspeed_sdhci_driver);
 }