From: Peter Hurley <peter@hurleysoftware.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <jslaby@suse.cz>,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>
Subject: [PATCH v2 1/8] serial: core: Fold __uart_put_char() into caller
Date: Sun, 10 Jan 2016 20:23:55 -0800 [thread overview]
Message-ID: <1452486242-7297-2-git-send-email-peter@hurleysoftware.com> (raw)
In-Reply-To: <1452486242-7297-1-git-send-email-peter@hurleysoftware.com>
uart_put_char() is the required interface; manually inline
__uart_put_char().
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
---
drivers/tty/serial/serial_core.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 3698ada..048b175 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -483,12 +483,15 @@ static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
spin_unlock_irq(&uport->lock);
}
-static inline int __uart_put_char(struct uart_port *port,
- struct circ_buf *circ, unsigned char c)
+static int uart_put_char(struct tty_struct *tty, unsigned char c)
{
+ struct uart_state *state = tty->driver_data;
+ struct uart_port *port = state->uart_port;
+ struct circ_buf *circ;
unsigned long flags;
int ret = 0;
+ circ = &state->xmit;
if (!circ->buf)
return 0;
@@ -502,13 +505,6 @@ static inline int __uart_put_char(struct uart_port *port,
return ret;
}
-static int uart_put_char(struct tty_struct *tty, unsigned char ch)
-{
- struct uart_state *state = tty->driver_data;
-
- return __uart_put_char(state->uart_port, &state->xmit, ch);
-}
-
static void uart_flush_chars(struct tty_struct *tty)
{
uart_start(tty);
--
2.7.0
next prev parent reply other threads:[~2016-01-11 4:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 4:23 [PATCH v2 0/8] Misc serial cleanups Peter Hurley
2016-01-11 4:23 ` Peter Hurley [this message]
2016-01-11 4:23 ` [PATCH v2 2/8] serial: core: Fold do_uart_get_info() into caller Peter Hurley
2016-01-11 4:23 ` [PATCH v2 3/8] serial: core: Use tty->index for port # in debug messages Peter Hurley
2016-01-11 4:23 ` [PATCH v2 4/8] serial: Fix ASYNC_* => UPF_* flags misuse Peter Hurley
2016-01-11 4:23 ` [PATCH v2 5/8] serial: core: Cleanup uart_open() exit Peter Hurley
2016-01-11 4:24 ` [PATCH v2 6/8] serial: core: Remove cast from void ptr in uart_open() Peter Hurley
2016-01-11 4:24 ` [PATCH v2 7/8] serial: core: Unfold < 80 char lines Peter Hurley
2016-01-11 4:24 ` [PATCH v2 8/8] serial: core: Perform RTS signalling before soft flow ctrl Peter Hurley
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=1452486242-7297-2-git-send-email-peter@hurleysoftware.com \
--to=peter@hurleysoftware.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@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;
as well as URLs for NNTP newsgroup(s).