From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: linux-input@vger.kernel.org
Cc: Benjamin Tissoires <bentiss@kernel.org>,
Jeff LaBundy <jeff@labundy.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/7] Input: make sure input handlers define only one processing method
Date: Wed, 3 Jul 2024 14:37:49 -0700 [thread overview]
Message-ID: <20240703213756.3375978-3-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20240703213756.3375978-1-dmitry.torokhov@gmail.com>
Input core expects input handlers to be either filters, or regular
handlers, but not both. Additionally, for regular handlers it does
not make sense to define both single event method and batch method.
Refuse registering handler if it defines more than one method.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/input/input.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/drivers/input/input.c b/drivers/input/input.c
index fd4997ba263c..7e4f8824f4fd 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -2517,6 +2517,26 @@ void input_unregister_device(struct input_dev *dev)
}
EXPORT_SYMBOL(input_unregister_device);
+static int input_handler_check_methods(const struct input_handler *handler)
+{
+ int count = 0;
+
+ if (handler->filter)
+ count++;
+ if (handler->events)
+ count++;
+ if (handler->event)
+ count++;
+
+ if (count > 1) {
+ pr_err("%s: only one event processing method can be defined (%s)\n",
+ __func__, handler->name);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
/**
* input_register_handler - register a new input handler
* @handler: handler to be registered
@@ -2530,6 +2550,10 @@ int input_register_handler(struct input_handler *handler)
struct input_dev *dev;
int error;
+ error = input_handler_check_methods(handler);
+ if (error)
+ return error;
+
error = mutex_lock_interruptible(&input_mutex);
if (error)
return error;
--
2.45.2.803.g4e1b14247a-goog
next prev parent reply other threads:[~2024-07-03 21:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-03 21:37 [PATCH v2 0/7] Simplify event handling logic in input core Dmitry Torokhov
2024-07-03 21:37 ` [PATCH v2 1/7] Input: evdev - remove ->event() method Dmitry Torokhov
2024-07-07 19:53 ` Jeff LaBundy
2024-07-03 21:37 ` Dmitry Torokhov [this message]
2024-07-07 19:53 ` [PATCH v2 2/7] Input: make sure input handlers define only one processing method Jeff LaBundy
2024-07-03 21:37 ` [PATCH v2 3/7] Input: make events() method return number of events processed Dmitry Torokhov
2024-07-07 19:54 ` Jeff LaBundy
2024-07-03 21:37 ` [PATCH v2 4/7] Input: simplify event handling logic Dmitry Torokhov
2024-07-07 19:55 ` Jeff LaBundy
2024-07-03 21:37 ` [PATCH v2 5/7] Input: rearrange input_alloc_device() to prepare for preallocating of vals Dmitry Torokhov
2024-07-07 19:56 ` Jeff LaBundy
2024-07-03 21:37 ` [PATCH v2 6/7] Input: preallocate memory to hold event values Dmitry Torokhov
2024-07-07 19:56 ` Jeff LaBundy
2024-07-03 21:37 ` [PATCH v2 7/7] Input: do not check number of events in input_pass_values() Dmitry Torokhov
2024-07-07 19:57 ` Jeff LaBundy
2024-07-04 6:44 ` [PATCH v2 0/7] Simplify event handling logic in input core Benjamin Tissoires
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=20240703213756.3375978-3-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=bentiss@kernel.org \
--cc=jeff@labundy.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox