From: Rob Herring <robh@kernel.org>
To: Alan Cox <alan@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>,
Peter Hurley <peter@hurleysoftware.com>
Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org
Subject: [PATCH 8/9] tty: serial_core: remove dependence on tty->driver_data
Date: Fri, 9 Sep 2016 17:37:09 -0500 [thread overview]
Message-ID: <20160909223711.26238-9-robh@kernel.org> (raw)
In-Reply-To: <20160909223711.26238-1-robh@kernel.org>
As the uart_state contains tty_port, use that to get the uart_state ptr.
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/tty/serial/serial_core.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 8f2b52174263..b9ec9fd688a2 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -120,7 +120,7 @@ void uart_write_wakeup(struct uart_port *port)
static void uart_stop(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
unsigned long flags;
@@ -138,7 +138,7 @@ static void __uart_start(struct uart_port *port)
static void uart_start(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
unsigned long flags;
@@ -517,7 +517,7 @@ static void uart_change_speed(struct tty_port *port, struct ktermios *old_termio
static int uart_put_char(struct tty_struct *tty, unsigned char c)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
struct circ_buf *circ;
unsigned long flags;
@@ -545,7 +545,7 @@ static void uart_flush_chars(struct tty_struct *tty)
static int uart_write(struct tty_struct *tty,
const unsigned char *buf, int count)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *uport;
struct circ_buf *circ;
unsigned long flags;
@@ -585,7 +585,7 @@ static int uart_write(struct tty_struct *tty,
static int uart_write_room(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
unsigned long flags;
int ret;
@@ -598,7 +598,7 @@ static int uart_write_room(struct tty_struct *tty)
static int uart_chars_in_buffer(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
unsigned long flags;
int ret;
@@ -611,7 +611,7 @@ static int uart_chars_in_buffer(struct tty_struct *tty)
static void uart_flush_buffer(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
unsigned long flags;
@@ -642,7 +642,7 @@ static void uart_flush_buffer(struct tty_struct *tty)
*/
static void uart_send_xchar(struct tty_struct *tty, char ch)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
unsigned long flags;
@@ -664,7 +664,7 @@ static void uart_send_xchar(struct tty_struct *tty, char ch)
static void uart_throttle(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
upstat_t mask = 0;
@@ -693,7 +693,7 @@ static void uart_throttle(struct tty_struct *tty)
static void uart_unthrottle(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
upstat_t mask = 0;
@@ -1026,7 +1026,7 @@ static int uart_get_lsr_info(struct tty_struct *tty,
static int uart_tiocmget(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct tty_port *port = &state->port;
struct uart_port *uport;
int result = -EIO;
@@ -1050,7 +1050,7 @@ out:
static int
uart_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct tty_port *port = &state->port;
struct uart_port *uport;
int ret = -EIO;
@@ -1071,7 +1071,7 @@ out:
static int uart_break_ctl(struct tty_struct *tty, int break_state)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct tty_port *port = &state->port;
struct uart_port *uport;
int ret = -EIO;
@@ -1221,7 +1221,7 @@ static int uart_wait_modem_status(struct uart_state *state, unsigned long arg)
static int uart_get_icount(struct tty_struct *tty,
struct serial_icounter_struct *icount)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_icount cnow;
struct uart_port *uport;
@@ -1295,7 +1295,7 @@ static int uart_set_rs485_config(struct uart_port *port,
static int
uart_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct tty_port *port = &state->port;
struct uart_port *uport;
void __user *uarg = (void __user *)arg;
@@ -1386,7 +1386,7 @@ out:
static void uart_set_ldisc(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *uport;
mutex_lock(&state->port.mutex);
@@ -1400,7 +1400,7 @@ static void uart_set_termios(struct tty_struct *tty,
struct ktermios *old_termios)
{
struct tty_port *port = tty->port;
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(port);
struct uart_port *uport;
unsigned int cflag = tty->termios.c_cflag;
unsigned int iflag_mask = IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK;
@@ -1461,7 +1461,7 @@ out:
*/
static void uart_close(struct tty_struct *tty, struct file *filp)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct tty_port *port;
if (!state) {
@@ -1512,7 +1512,7 @@ static void uart_tty_port_shutdown(struct tty_port *port)
static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct uart_port *port;
unsigned long char_time, expire;
@@ -1576,7 +1576,7 @@ static void uart_wait_until_sent(struct tty_struct *tty, int timeout)
*/
static void uart_hangup(struct tty_struct *tty)
{
- struct uart_state *state = tty->driver_data;
+ struct uart_state *state = tty_port_to_uart_state(tty->port);
struct tty_port *port = &state->port;
struct uart_port *uport;
unsigned long flags;
--
2.9.3
next prev parent reply other threads:[~2016-09-09 22:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 22:37 [PATCH 0/9] tty: tty_struct dependency clean-ups Rob Herring
2016-09-09 22:37 ` [PATCH 1/9] tty: serial_core: add tty NULL check to uart_tx_stopped Rob Herring
2016-09-09 22:37 ` [PATCH 2/9] tty: remove tty_struct dependency in tty flag macros Rob Herring
2016-09-10 1:02 ` Rob Herring
2016-09-09 22:37 ` [PATCH 3/9] tty: move hw_stopped flag to tty_port Rob Herring
2016-09-11 21:15 ` One Thousand Gnomes
2016-09-09 22:37 ` [PATCH 4/9] tty: move TTY_IO_ERROR flag to tty_port iflags Rob Herring
2016-09-11 21:18 ` One Thousand Gnomes
2016-09-09 22:37 ` [PATCH 5/9] tty: serial_core: use tty_port_tty_wakeup instead of tty_wakeup Rob Herring
2016-09-09 22:37 ` [PATCH 6/9] tty: serial_core: introduce tty_port_to_uart_state Rob Herring
2016-09-09 22:37 ` [PATCH 7/9] tty: serial_core: convert private functions to use tty_port instead of tty_struct Rob Herring
2016-09-09 22:37 ` Rob Herring [this message]
2016-09-09 22:37 ` [PATCH 9/9] tty: serial_core: add tty NULL check in uart_port_startup Rob Herring
2016-09-11 21:20 ` One Thousand Gnomes
2016-09-11 21:14 ` [PATCH 0/9] tty: tty_struct dependency clean-ups One Thousand Gnomes
2016-09-12 3:05 ` Rob Herring
2016-09-12 11:46 ` One Thousand Gnomes
2016-09-15 10:43 ` 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=20160909223711.26238-9-robh@kernel.org \
--to=robh@kernel.org \
--cc=alan@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=peter@hurleysoftware.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 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).