ata: sata_gemini: Remove dependency on OF for compile tests

If CONFIG_OF is disabled, then using the macro of_match_ptr() results
in the gemini_sata_of_match variable being unused, which generates a
compilation warning and a compilation error if CONFIG_WERROR is enabled.

Removing the use of this macro by directly assigning the
gemini_sata_of_match match table to the .of_match_table field in the
platform driver definition allows removing the dependency on OF for
compile tests, thus improving compile test coverage.

Fixes: f7220eac752f ("ata: Kconfig: fix sata gemini compile test condition")
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 36833a8629980785593f29151927a3dd1e6c2c28..37e065106baffe5ce72fe3268cb801a7d3ceb567 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -295,7 +295,7 @@ config SATA_FSL
 
 config SATA_GEMINI
        tristate "Gemini SATA bridge support"
-       depends on ARCH_GEMINI || (OF && COMPILE_TEST)
+       depends on ARCH_GEMINI || COMPILE_TEST
        select SATA_HOST
        default ARCH_GEMINI
        help

diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
index b729e9919bb0c7c03daffd1b63558906a75174f6..c42cc9bbbc4ed46188a8a80b7f2837cbd732d5b8 100644 (file)
--- a/drivers/ata/sata_gemini.c
+++ b/drivers/ata/sata_gemini.c
@@ -421,7 +421,7 @@ static const struct of_device_id gemini_sata_of_match[] = {
 static struct platform_driver gemini_sata_driver = {
        .driver = {
                .name = DRV_NAME,
-               .of_match_table = of_match_ptr(gemini_sata_of_match),
+               .of_match_table = gemini_sata_of_match,
        },
        .probe = gemini_sata_probe,
        .remove = gemini_sata_remove,