i2c: muxes: Drop obsolete dependency on COMPILE_TEST

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@suse.de>
Acked-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 1708b1a82da28f5370d853bd0bf11b619f0dce93..ea838dbae32e53c4ebcb505a70572e714a28ca2f 100644 (file)
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -9,7 +9,7 @@ menu "Multiplexer I2C Chip support"
 config I2C_ARB_GPIO_CHALLENGE
        tristate "GPIO-based I2C arbitration"
        depends on GPIOLIB || COMPILE_TEST
-       depends on OF || COMPILE_TEST
+       depends on OF
        help
          If you say yes to this option, support will be included for an
          I2C multimaster arbitration scheme using GPIOs and a challenge &
@@ -34,7 +34,7 @@ config I2C_MUX_GPIO
 config I2C_MUX_GPMUX
        tristate "General Purpose I2C multiplexer"
        select MULTIPLEXER
-       depends on OF || COMPILE_TEST
+       depends on OF
        help
          If you say yes to this option, support will be included for a
          general purpose I2C multiplexer. This driver provides access to
@@ -77,7 +77,7 @@ config I2C_MUX_PCA954x
 config I2C_MUX_PINCTRL
        tristate "pinctrl-based I2C multiplexer"
        depends on PINCTRL
-       depends on OF || COMPILE_TEST
+       depends on OF
        help
          If you say yes to this option, support will be included for an I2C
          multiplexer that uses the pinctrl subsystem, i.e. pin multiplexing.

diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index f1bb00a11ad628d7196494e88a56337989c99c21..d5ad904756fdf3c5005c66c7b3cffc5bcdc45edc 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -185,7 +185,7 @@ MODULE_DEVICE_TABLE(of, i2c_mux_pinctrl_of_match);
 static struct platform_driver i2c_mux_pinctrl_driver = {
        .driver = {
                .name   = "i2c-mux-pinctrl",
-               .of_match_table = of_match_ptr(i2c_mux_pinctrl_of_match),
+               .of_match_table = i2c_mux_pinctrl_of_match,
        },
        .probe  = i2c_mux_pinctrl_probe,
        .remove = i2c_mux_pinctrl_remove,