| Message ID | 20230127122816.02b6ea26@endymion.delvare (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND] Input: atmel_captouch - drop obsolete dependency on COMPILE_TEST | expand |
Hi Jean, On Fri, Jan 27, 2023 at 12:28:16PM +0100, Jean Delvare wrote: > 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. > > As a nice side effect, dropping the alternative dependency on > COMPILE_TEST allows removing preprocessor directives, which will > speed up the build. I believe I already have your patch in my "next" branch that is feeding into linux-next. Thanks.
Hi Dmitry Torokhov, On Sun, 29 Jan 2023 18:32:42 -0800, Dmitry Torokhov wrote: > On Fri, Jan 27, 2023 at 12:28:16PM +0100, Jean Delvare wrote: > > 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. > > > > As a nice side effect, dropping the alternative dependency on > > COMPILE_TEST allows removing preprocessor directives, which will > > speed up the build. > > I believe I already have your patch in my "next" branch that is feeding > into linux-next. Oh right, sorry for the noise. I did not receive a formal ack from you at the time, so I thought it got lost in traffic. I should have double-checked, by bad. Thanks,
--- linux-6.1.orig/drivers/input/misc/Kconfig +++ linux-6.1/drivers/input/misc/Kconfig @@ -107,7 +107,7 @@ config INPUT_ATC260X_ONKEY config INPUT_ATMEL_CAPTOUCH tristate "Atmel Capacitive Touch Button Driver" - depends on OF || COMPILE_TEST + depends on OF depends on I2C help Say Y here if an Atmel Capacitive Touch Button device which --- linux-6.1.orig/drivers/input/misc/atmel_captouch.c +++ linux-6.1/drivers/input/misc/atmel_captouch.c @@ -249,7 +249,6 @@ static int atmel_captouch_probe(struct i return 0; } -#ifdef CONFIG_OF static const struct of_device_id atmel_captouch_of_id[] = { { .compatible = "atmel,captouch", @@ -257,7 +256,6 @@ static const struct of_device_id atmel_c { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, atmel_captouch_of_id); -#endif static const struct i2c_device_id atmel_captouch_id[] = { { "atmel_captouch", 0 }, @@ -270,7 +268,7 @@ static struct i2c_driver atmel_captouch_ .id_table = atmel_captouch_id, .driver = { .name = "atmel_captouch", - .of_match_table = of_match_ptr(atmel_captouch_of_id), + .of_match_table = atmel_captouch_of_id, }, }; module_i2c_driver(atmel_captouch_driver);
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. As a nice side effect, dropping the alternative dependency on COMPILE_TEST allows removing preprocessor directives, which will speed up the build. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: Daniel Hung-yu Wu <hywu@google.com> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/misc/Kconfig | 2 +- drivers/input/misc/atmel_captouch.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-)