media: rc: Drop obsolete dependencies 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.

As a minor optimization, this also lets us drop of_match_ptr(), as we
now know what it will resolve to, we might as well save cpp some work.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index f560fc38895f7f15dbe288db4d79899206ef0eb7..ac4172feb6f9411c476d120ef5e738e2dedbf75d 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -314,7 +314,7 @@ config IR_PWM_TX
        tristate "PWM IR transmitter"
        depends on LIRC
        depends on PWM
-       depends on OF || COMPILE_TEST
+       depends on OF
        help
           Say Y if you want to use a PWM based IR transmitter. This is
           more power efficient than the bit banging gpio driver.
@@ -361,7 +361,7 @@ config IR_SERIAL_TRANSMITTER
 config IR_SPI
        tristate "SPI connected IR LED"
        depends on SPI && LIRC
-       depends on OF || COMPILE_TEST
+       depends on OF
        help
          Say Y if you want to use an IR LED connected through SPI bus.
 

diff --git a/drivers/media/rc/pwm-ir-tx.c b/drivers/media/rc/pwm-ir-tx.c
index 105a9c24f1e3fbc74d7a27f620638166276be288..7732054c4621e614fac262fd9da044abf8771e6e 100644 (file)
--- a/drivers/media/rc/pwm-ir-tx.c
+++ b/drivers/media/rc/pwm-ir-tx.c
@@ -120,7 +120,7 @@ static struct platform_driver pwm_ir_driver = {
        .probe = pwm_ir_probe,
        .driver = {
                .name   = DRIVER_NAME,
-               .of_match_table = of_match_ptr(pwm_ir_of_match),
+               .of_match_table = pwm_ir_of_match,
        },
 };
 module_platform_driver(pwm_ir_driver);