From: Che-Liang Chiou <clchiou@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-input@vger.kernel.org,
Che-Liang Chiou <clchiou@chromium.org>
Subject: [PATCH 3/5] Input: serio_raw - factor out common pattern of write
Date: Wed, 8 Feb 2012 11:24:55 +0800 [thread overview]
Message-ID: <1328671497-20880-4-git-send-email-clchiou@chromium.org> (raw)
In-Reply-To: <1328671497-20880-1-git-send-email-clchiou@chromium.org>
In-Reply-To: <1328084386-31110-1-git-send-email-clchiou@chromium.org>
As write to /dev/serio_raw* and to /sys/kernel/debug/serio_raw*/device
share a common pattern, this patch extracts that pattern and put it in
the serio_raw_write_mainloop() function.
Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
---
drivers/input/serio/serio_raw.c | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index bc2a8c7..5d13c64 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -269,12 +269,12 @@ static ssize_t serio_raw_read(struct file *file, char __user *buffer,
serio_raw_fetch_byte);
}
-static ssize_t serio_raw_write(struct file *file, const char __user *buffer,
- size_t count, loff_t *ppos)
+static ssize_t serio_raw_write_mainloop(struct serio_raw *serio_raw,
+ const char __user *buffer, size_t count,
+ bool write_to_dev, struct queue *queue)
{
- struct serio_raw_client *client = file->private_data;
- struct serio_raw *serio_raw = client->serio_raw;
ssize_t written = 0;
+ bool wakeup = false;
int retval;
unsigned char c;
@@ -293,20 +293,33 @@ static ssize_t serio_raw_write(struct file *file, const char __user *buffer,
while (count--) {
if (get_user(c, buffer++)) {
retval = -EFAULT;
- goto out;
+ break;
}
- if (serio_write(serio_raw->serio, c)) {
+ if (write_to_dev && serio_write(serio_raw->serio, c)) {
retval = -EIO;
- goto out;
+ break;
}
+ if (queue)
+ wakeup |= queue_write_byte(queue, c);
written++;
}
+ if (queue && wakeup)
+ queue_wakeup(queue);
out:
mutex_unlock(&serio_raw_mutex);
return written ?: retval;
}
+static ssize_t serio_raw_write(struct file *file, const char __user *buffer,
+ size_t count, loff_t *ppos)
+{
+ struct serio_raw_client *client = file->private_data;
+ struct serio_raw *serio_raw = client->serio_raw;
+
+ return serio_raw_write_mainloop(serio_raw, buffer, count, true, NULL);
+}
+
static unsigned int serio_raw_poll(struct file *file, poll_table *wait)
{
struct serio_raw_client *client = file->private_data;
--
1.7.7.3
next prev parent reply other threads:[~2012-02-08 3:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-01 8:19 [PATCH] Input: serio_raw - return proper result when serio_raw_read fails Che-Liang Chiou
2012-02-08 3:24 ` [PATCH 0/5] Input: serio_raw - add monitor/replay debugging interface Che-Liang Chiou
2012-02-14 3:18 ` Daniel Kurtz
2012-04-21 6:21 ` Dmitry Torokhov
2012-05-28 9:41 ` Che-liang Chiou
2012-02-08 3:24 ` [PATCH 1/5] Input: serio_raw - return proper result when serio_raw_read fails Che-Liang Chiou
2012-02-08 3:24 ` [PATCH 2/5] Input: serio_raw - extract queue interface Che-Liang Chiou
2012-02-08 3:24 ` Che-Liang Chiou [this message]
2012-02-08 3:24 ` [PATCH 4/5] Input: serio_raw - add debugfs interface Che-Liang Chiou
2012-02-08 3:24 ` [PATCH 5/5] Input: serio_raw - implement " Che-Liang Chiou
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=1328671497-20880-4-git-send-email-clchiou@chromium.org \
--to=clchiou@chromium.org \
--cc=dmitry.torokhov@gmail.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
all inboxes | Powered by JetHome®