From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755670AbcIIWh2 (ORCPT ); Fri, 9 Sep 2016 18:37:28 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:36621 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755586AbcIIWhU (ORCPT ); Fri, 9 Sep 2016 18:37:20 -0400 From: Rob Herring To: Alan Cox , Greg Kroah-Hartman , Jiri Slaby , Peter Hurley Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org Subject: [PATCH 6/9] tty: serial_core: introduce tty_port_to_uart_state Date: Fri, 9 Sep 2016 17:37:07 -0500 Message-Id: <20160909223711.26238-7-robh@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160909223711.26238-1-robh@kernel.org> References: <20160909223711.26238-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The uart_state is a container of tty_port. Add an inline to convert tty_port ptr to uart_state ptr and convert existing container_of users. Signed-off-by: Rob Herring --- drivers/tty/serial/serial_core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index d48ea0a98e92..29eef4644e98 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -93,6 +93,11 @@ static inline void uart_port_deref(struct uart_port *uport) uart_port_deref(__uport); \ }) +static inline struct uart_state *tty_port_to_uart_state(struct tty_port *port) +{ + return container_of(port, struct uart_state, port); +} + static inline struct uart_port *uart_port_check(struct uart_state *state) { lockdep_assert_held(&state->port.mutex); @@ -720,7 +725,7 @@ static void uart_unthrottle(struct tty_struct *tty) static int uart_get_info(struct tty_port *port, struct serial_struct *retinfo) { - struct uart_state *state = container_of(port, struct uart_state, port); + struct uart_state *state = tty_port_to_uart_state(port); struct uart_port *uport; int ret = -ENODEV; @@ -1603,7 +1608,7 @@ static void uart_hangup(struct tty_struct *tty) /* uport == NULL if uart_port has already been removed */ static void uart_port_shutdown(struct tty_port *port) { - struct uart_state *state = container_of(port, struct uart_state, port); + struct uart_state *state = tty_port_to_uart_state(port); struct uart_port *uport = uart_port_check(state); /* @@ -1630,7 +1635,7 @@ static void uart_port_shutdown(struct tty_port *port) static int uart_carrier_raised(struct tty_port *port) { - struct uart_state *state = container_of(port, struct uart_state, port); + struct uart_state *state = tty_port_to_uart_state(port); struct uart_port *uport; int mctrl; @@ -1655,7 +1660,7 @@ static int uart_carrier_raised(struct tty_port *port) static void uart_dtr_rts(struct tty_port *port, int onoff) { - struct uart_state *state = container_of(port, struct uart_state, port); + struct uart_state *state = tty_port_to_uart_state(port); struct uart_port *uport; uport = uart_port_ref(state); -- 2.9.3