From: Jean Delvare <jdelvare@suse.de>
To: linux-input@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Cc: Daniel Hung-yu Wu <hywu@google.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Nicolas Ferre <nicolas.ferre@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Claudiu Beznea <claudiu.beznea@microchip.com>
Subject: [PATCH RESEND] Input: atmel_captouch - drop obsolete dependency on COMPILE_TEST
Date: Fri, 27 Jan 2023 12:28:16 +0100 [thread overview]
Message-ID: <20230127122816.02b6ea26@endymion.delvare> (raw)
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(-)
--- 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);
--
Jean Delvare
SUSE L3 Support
next reply other threads:[~2023-01-27 11:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 11:28 Jean Delvare [this message]
2023-01-30 2:32 ` [PATCH RESEND] Input: atmel_captouch - drop obsolete dependency on COMPILE_TEST Dmitry Torokhov
2023-01-30 11:57 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230127122816.02b6ea26@endymion.delvare \
--to=jdelvare@suse.de \
--cc=alexandre.belloni@bootlin.com \
--cc=claudiu.beznea@microchip.com \
--cc=dmitry.torokhov@gmail.com \
--cc=hywu@google.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.