Since commit 0166dc11be91 ("of: make CONFIG_OF user selectable"), it is possible to test-build any driver which depends on OF on any architecture by explicitly selecting OF. Therefore depending on COMPILE_TEST as an alternative is no longer needed. It is actually better to always build such drivers with OF enabled, so that the test builds are closer to how each driver will actually be built on its intended target. Building them without OF may not test much as the compiler will optimize out potentially large parts of the code. In the worst case, this could even pop false positive warnings. Dropping COMPILE_TEST here improves the quality of our testing and avoids wasting time on non-existent issues. Signed-off-by: Jean Delvare <jdelvare@xxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxx> --- drivers/spi/Kconfig | 2 +- drivers/spi/spi-cadence-xspi.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) --- linux-6.0.orig/drivers/spi/Kconfig +++ linux-6.0/drivers/spi/Kconfig @@ -241,7 +241,7 @@ config SPI_CADENCE_QUADSPI config SPI_CADENCE_XSPI tristate "Cadence XSPI controller" - depends on (OF || COMPILE_TEST) && HAS_IOMEM + depends on OF && HAS_IOMEM depends on SPI_MEM help Enable support for the Cadence XSPI Flash controller. --- linux-6.0.orig/drivers/spi/spi-cadence-xspi.c +++ linux-6.0/drivers/spi/spi-cadence-xspi.c @@ -609,7 +609,6 @@ static int cdns_xspi_probe(struct platfo return 0; } -#ifdef CONFIG_OF static const struct of_device_id cdns_xspi_of_match[] = { { .compatible = "cdns,xspi-nor", @@ -617,9 +616,6 @@ static const struct of_device_id cdns_xs { /* end of table */} }; MODULE_DEVICE_TABLE(of, cdns_xspi_of_match); -#else -#define cdns_xspi_of_match NULL -#endif /* CONFIG_OF */ static struct platform_driver cdns_xspi_platform_driver = { .probe = cdns_xspi_probe, -- Jean Delvare SUSE L3 Support