From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Pavel Machek <pavel@ucw.cz>, Dan Murphy <dmurphy@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>
Cc: linux-kernel@vger.kernel.org, linux-leds@vger.kernel.org,
linux-serial@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH v2 2/3] tty: new helper function tty_get_icount()
Date: Tue, 17 Dec 2019 09:17:17 +0100 [thread overview]
Message-ID: <20191217081718.23807-3-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20191217081718.23807-1-u.kleine-koenig@pengutronix.de>
For a given struct tty_struct this yields the corresponding statistics
about sent and received characters (and some more)
Use the function to simplify tty_tiocgicount().
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/tty/tty_io.c | 20 ++++++++++++++++----
include/linux/tty.h | 2 ++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 584025117cd3..df3942eb3468 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2497,15 +2497,27 @@ static int tty_tiocmset(struct tty_struct *tty, unsigned int cmd,
return tty->ops->tiocmset(tty, set, clear);
}
+int tty_get_icount(struct tty_struct *tty,
+ struct serial_icounter_struct *icount)
+{
+ memset(icount, 0, sizeof(*icount));
+
+ if (tty->ops->get_icount)
+ return tty->ops->get_icount(tty, icount);
+ else
+ return -EINVAL;
+}
+EXPORT_SYMBOL(tty_get_icount);
+
static int tty_tiocgicount(struct tty_struct *tty, void __user *arg)
{
- int retval = -EINVAL;
struct serial_icounter_struct icount;
- memset(&icount, 0, sizeof(icount));
- if (tty->ops->get_icount)
- retval = tty->ops->get_icount(tty, &icount);
+ int retval;
+
+ retval = tty_get_icount(tty, &icount);
if (retval != 0)
return retval;
+
if (copy_to_user(arg, &icount, sizeof(icount)))
return -EFAULT;
return 0;
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 616268eb1613..3c6f58032f57 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -495,6 +495,8 @@ extern void tty_unthrottle(struct tty_struct *tty);
extern int tty_throttle_safe(struct tty_struct *tty);
extern int tty_unthrottle_safe(struct tty_struct *tty);
extern int tty_do_resize(struct tty_struct *tty, struct winsize *ws);
+extern int tty_get_icount(struct tty_struct *tty,
+ struct serial_icounter_struct *icount);
extern int is_current_pgrp_orphaned(void);
extern void tty_hangup(struct tty_struct *tty);
extern void tty_vhangup(struct tty_struct *tty);
--
2.24.0
next prev parent reply other threads:[~2019-12-17 8:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 8:17 [PATCH v2 0/3] tty/leds: implement a trigger for ttys Uwe Kleine-König
2019-12-17 8:17 ` [PATCH v2 1/3] tty: new helper function tty_kopen_shared Uwe Kleine-König
2019-12-17 8:27 ` Greg Kroah-Hartman
2019-12-17 10:51 ` Uwe Kleine-König
2019-12-17 11:05 ` Greg Kroah-Hartman
2019-12-17 8:17 ` Uwe Kleine-König [this message]
2019-12-17 8:28 ` [PATCH v2 2/3] tty: new helper function tty_get_icount() Greg Kroah-Hartman
2019-12-17 8:17 ` [PATCH v2 3/3] leds: trigger: implement a tty trigger Uwe Kleine-König
2019-12-17 8:32 ` Greg Kroah-Hartman
2019-12-17 10:58 ` Uwe Kleine-König
2019-12-17 11:07 ` Greg Kroah-Hartman
2019-12-17 8:32 ` [PATCH v2 0/3] tty/leds: implement a trigger for ttys Greg Kroah-Hartman
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=20191217081718.23807-3-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=dmurphy@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=jacek.anaszewski@gmail.com \
--cc=jslaby@suse.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-leds@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=pavel@ucw.cz \
/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;
as well as URLs for NNTP newsgroup(s).