[PATCH 00/15] drivers/tty/: Deinline smaller/less used functions

[PATCH 00/15] drivers/tty/: Deinline smaller/less used functions

[Denys Vlasenko]

For Peter's review.
(Pater, I removed a few patches which looked most problematic)

Denys Vlasenko (15):
  cyclades: Deinline cyz_is_loaded, save 240 bytes
  isicom: Deinline drop_dtr, save 112 bytes
  tty: Deinline n_tty_receive_char_inline, save 224 bytes
  serial/fsl_lpuart: Deinline lpuart_transmit_buffer, save 176 bytes
  serial/m32r_sio: Deinline wait_for_xmitr, save 165 bytes
  serial/men_z135_uart: Deinline men_z135_reg_clr, save 176 bytes
  serial/msm_serial: Deinline wait_for_xmitr, save 165 bytes
  serial/omap-serial: Deinline wait_for_xmitr, save 165 bytes
  serial/pxa: Deinline wait_for_xmitr, save 165 bytes
  serial/sprd_serial: Deinline wait_for_xmitr, save 165 bytes
  serial/sunsu: Deinline wait_for_xmitr, save 165 bytes
  serial/vt8500_serial: Deinline wait_for_xmitr, save 165 bytes
  tty: Deinline __ldsem_down_read_nested, save 128 bytes
  tty: Deinline __ldsem_down_write_nested, save 128 bytes
  vt: Deinline save_screen, save 238 bytes

 drivers/tty/cyclades.c             | 2 +-
 drivers/tty/isicom.c               | 2 +-
 drivers/tty/n_tty.c                | 2 +-
 drivers/tty/serial/fsl_lpuart.c    | 2 +-
 drivers/tty/serial/m32r_sio.c      | 2 +-
 drivers/tty/serial/men_z135_uart.c | 2 +-
 drivers/tty/serial/msm_serial.c    | 2 +-
 drivers/tty/serial/omap-serial.c   | 2 +-
 drivers/tty/serial/pxa.c           | 2 +-
 drivers/tty/serial/sprd_serial.c   | 2 +-
 drivers/tty/serial/sunsu.c         | 2 +-
 drivers/tty/serial/vt8500_serial.c | 2 +-
 drivers/tty/tty_ldsem.c            | 4 ++--
 drivers/tty/vt/vt.c                | 2 +-
 14 files changed, 15 insertions(+), 15 deletions(-)

-- 
1.8.1.4

[PATCH 01/15] cyclades: Deinline cyz_is_loaded, save 240 bytes

[Denys Vlasenko]

This function compiles to 58 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/cyclades.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 87f6578..1492938 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -321,7 +321,7 @@ static inline bool cyz_fpga_loaded(struct cyclades_card *card)
 	return __cyz_fpga_loaded(card->ctl_addr.p9060);
 }
 
-static inline bool cyz_is_loaded(struct cyclades_card *card)
+static bool cyz_is_loaded(struct cyclades_card *card)
 {
 	struct FIRM_ID __iomem *fw_id = card->base_addr + ID_ADDRESS;
 
-- 
1.8.1.4

[PATCH 02/15] isicom: Deinline drop_dtr, save 112 bytes

[Denys Vlasenko]

This function compiles to 181 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/isicom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 2054427..029fd0d 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -280,7 +280,7 @@ static void raise_dtr(struct isi_port *port)
 }
 
 /* card->lock HAS to be held */
-static inline void drop_dtr(struct isi_port *port)
+static void drop_dtr(struct isi_port *port)
 {
 	struct isi_board *card = port->card;
 	unsigned long base = card->base;
-- 
1.8.1.4

[PATCH 03/15] tty: Deinline n_tty_receive_char_inline, save 224 bytes

[Denys Vlasenko]

This function compiles to 198 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/n_tty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index b09023b..c38f5d8 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1407,7 +1407,7 @@ handle_newline:
 	return 0;
 }
 
-static inline void
+static void
 n_tty_receive_char_inline(struct tty_struct *tty, unsigned char c)
 {
 	struct n_tty_data *ldata = tty->disc_data;
-- 
1.8.1.4

[PATCH 04/15] serial/fsl_lpuart: Deinline lpuart_transmit_buffer, save 176 bytes

[Denys Vlasenko]

This function compiles to 172 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/serial/fsl_lpuart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 08ce76f..ac26303 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -527,7 +527,7 @@ static inline void lpuart_prepare_rx(struct lpuart_port *sport)
 	spin_unlock_irqrestore(&sport->port.lock, flags);
 }
 
-static inline void lpuart_transmit_buffer(struct lpuart_port *sport)
+static void lpuart_transmit_buffer(struct lpuart_port *sport)
 {
 	struct circ_buf *xmit = &sport->port.state->xmit;
 
-- 
1.8.1.4

[PATCH 05/15] serial/m32r_sio: Deinline wait_for_xmitr, save 165 bytes

[Denys Vlasenko]

This function compiles to 141 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/serial/m32r_sio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c
index 8f7f83a..0eeb64f 100644
--- a/drivers/tty/serial/m32r_sio.c
+++ b/drivers/tty/serial/m32r_sio.c
@@ -990,7 +990,7 @@ static void __init m32r_sio_register_ports(struct uart_driver *drv)
 /*
  *	Wait for transmitter & holding register to empty
  */
-static inline void wait_for_xmitr(struct uart_sio_port *up)
+static void wait_for_xmitr(struct uart_sio_port *up)
 {
 	unsigned int status, tmout = 10000;
 
-- 
1.8.1.4

[PATCH 06/15] serial/men_z135_uart: Deinline men_z135_reg_clr, save 176 bytes

[Denys Vlasenko]

This function compiles to 98 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/serial/men_z135_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/men_z135_uart.c b/drivers/tty/serial/men_z135_uart.c
index b90e7b3..2b5b66f 100644
--- a/drivers/tty/serial/men_z135_uart.c
+++ b/drivers/tty/serial/men_z135_uart.c
@@ -159,7 +159,7 @@ static inline void men_z135_reg_set(struct men_z135_port *uart,
  * @addr: Register address
  * @val: value to clear
  */
-static inline void men_z135_reg_clr(struct men_z135_port *uart,
+static void men_z135_reg_clr(struct men_z135_port *uart,
 				u32 addr, u32 val)
 {
 	struct uart_port *port = &uart->port;
-- 
1.8.1.4

[PATCH 07/15] serial/msm_serial: Deinline wait_for_xmitr, save 165 bytes

[Denys Vlasenko]

This function compiles to 141 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/serial/msm_serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index b73889c..da6f6e4 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -57,7 +57,7 @@ struct msm_port {
 	bool			break_detected;
 };
 
-static inline void wait_for_xmitr(struct uart_port *port)
+static void wait_for_xmitr(struct uart_port *port)
 {
 	while (!(msm_read(port, UART_SR) & UART_SR_TX_EMPTY)) {
 		if (msm_read(port, UART_ISR) & UART_ISR_TX_READY)
-- 
1.8.1.4

[PATCH 08/15] serial/omap-serial: Deinline wait_for_xmitr, save 165 bytes

[Denys Vlasenko]

This function compiles to 141 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/serial/omap-serial.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 7a2172b..d404698 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -1163,7 +1163,7 @@ serial_omap_type(struct uart_port *port)
 
 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
 
-static inline void wait_for_xmitr(struct uart_omap_port *up)
+static void wait_for_xmitr(struct uart_omap_port *up)
 {
 	unsigned int status, tmout = 10000;
 
-- 
1.8.1.4

[PATCH 09/15] serial/pxa: Deinline wait_for_xmitr, save 165 bytes

[Denys Vlasenko]

This function compiles to 141 bytes of machine code.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Peter Hurley <peter@hurleysoftware.com>
CC: Jiri Slaby <jslaby@suse.com>
CC: linux-serial@vger.kernel.org
---
 drivers/tty/serial/pxa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
index 9becba6..41eab75 100644
--- a/drivers/tty/serial/pxa.c
+++ b/drivers/tty/serial/pxa.c
@@ -603,7 +603,7 @@ static struct uart_driver serial_pxa_reg;
 /*
  *	Wait for transmitter & holding register to empty
  */
-static inline void wait_for_xmitr(struct uart_pxa_port *up)
+static void wait_for_xmitr(struct uart_pxa_port *up)
 {
 	unsigned int status, tmout = 10000;
 
-- 
1.8.1.4

Re: [PATCH 03/15] tty: Deinline n_tty_receive_char_inline, save 224 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 198 bytes of machine code.
> 
> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Peter Hurley <peter@hurleysoftware.com>
> CC: Jiri Slaby <jslaby@suse.com>
> CC: linux-serial@vger.kernel.org
> ---
>  drivers/tty/n_tty.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
> index b09023b..c38f5d8 100644
> --- a/drivers/tty/n_tty.c
> +++ b/drivers/tty/n_tty.c
> @@ -1407,7 +1407,7 @@ handle_newline:
>  	return 0;
>  }
>  
> -static inline void
> +static void
>  n_tty_receive_char_inline(struct tty_struct *tty, unsigned char c)
>  {
>  	struct n_tty_data *ldata = tty->disc_data;
> 

This is one of the patches I will rework differently to remove the
inlining (n_tty_receive_char_inline() can be deleted and its call
sites replaced with n_tty_receive_char()).

Regards,
Peter Hurley

Re: [PATCH 00/15] drivers/tty/: Deinline smaller/less used functions

[Peter Hurley]

Hi Denys,

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> For Peter's review.
> (Pater, I removed a few patches which looked most problematic)

I'd take 'Deinline finish_erasing, save 112 bytes' as well.

Regards,
Peter Hurley

> Denys Vlasenko (15):
>   cyclades: Deinline cyz_is_loaded, save 240 bytes
>   isicom: Deinline drop_dtr, save 112 bytes
>   tty: Deinline n_tty_receive_char_inline, save 224 bytes
>   serial/fsl_lpuart: Deinline lpuart_transmit_buffer, save 176 bytes
>   serial/m32r_sio: Deinline wait_for_xmitr, save 165 bytes
>   serial/men_z135_uart: Deinline men_z135_reg_clr, save 176 bytes
>   serial/msm_serial: Deinline wait_for_xmitr, save 165 bytes
>   serial/omap-serial: Deinline wait_for_xmitr, save 165 bytes
>   serial/pxa: Deinline wait_for_xmitr, save 165 bytes
>   serial/sprd_serial: Deinline wait_for_xmitr, save 165 bytes
>   serial/sunsu: Deinline wait_for_xmitr, save 165 bytes
>   serial/vt8500_serial: Deinline wait_for_xmitr, save 165 bytes
>   tty: Deinline __ldsem_down_read_nested, save 128 bytes
>   tty: Deinline __ldsem_down_write_nested, save 128 bytes
>   vt: Deinline save_screen, save 238 bytes
> 
>  drivers/tty/cyclades.c             | 2 +-
>  drivers/tty/isicom.c               | 2 +-
>  drivers/tty/n_tty.c                | 2 +-
>  drivers/tty/serial/fsl_lpuart.c    | 2 +-
>  drivers/tty/serial/m32r_sio.c      | 2 +-
>  drivers/tty/serial/men_z135_uart.c | 2 +-
>  drivers/tty/serial/msm_serial.c    | 2 +-
>  drivers/tty/serial/omap-serial.c   | 2 +-
>  drivers/tty/serial/pxa.c           | 2 +-
>  drivers/tty/serial/sprd_serial.c   | 2 +-
>  drivers/tty/serial/sunsu.c         | 2 +-
>  drivers/tty/serial/vt8500_serial.c | 2 +-
>  drivers/tty/tty_ldsem.c            | 4 ++--
>  drivers/tty/vt/vt.c                | 2 +-
>  14 files changed, 15 insertions(+), 15 deletions(-)
> 

Re: [PATCH 01/15] cyclades: Deinline cyz_is_loaded, save 240 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 58 bytes of machine code.

Reviewed-by: Peter Hurley <peter@hurleysoftware.com>

Re: [PATCH 02/15] isicom: Deinline drop_dtr, save 112 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 181 bytes of machine code.

Reviewed-by: Peter Hurley <peter@hurleysoftware.com>

Re: [PATCH 04/15] serial/fsl_lpuart: Deinline lpuart_transmit_buffer, save 176 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 172 bytes of machine code.
> 
> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Peter Hurley <peter@hurleysoftware.com>
> CC: Jiri Slaby <jslaby@suse.com>
> CC: linux-serial@vger.kernel.org
> ---
>  drivers/tty/serial/fsl_lpuart.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index 08ce76f..ac26303 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -527,7 +527,7 @@ static inline void lpuart_prepare_rx(struct lpuart_port *sport)
>  	spin_unlock_irqrestore(&sport->port.lock, flags);
>  }
>  
> -static inline void lpuart_transmit_buffer(struct lpuart_port *sport)
> +static void lpuart_transmit_buffer(struct lpuart_port *sport)
>  {
>  	struct circ_buf *xmit = &sport->port.state->xmit;

You'll want to run your script(s) on Greg's tty-next tree;
this file has copy+paste changes for 4.4 that added
lpuart32_transmit_buffer() as an inline function.

Regards,
Peter Hurley

Re: [PATCH 05/15] serial/m32r_sio: Deinline wait_for_xmitr, save 165 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 141 bytes of machine code.

Reviewed-by: Peter Hurley <peter@hurleysoftware.com>

Re: [PATCH 07/15] serial/msm_serial: Deinline wait_for_xmitr, save 165 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 141 bytes of machine code.

Fails to apply to tty-next

Regards,
Peter Hurley

Re: [PATCH 08/15] serial/omap-serial: Deinline wait_for_xmitr, save 165 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 141 bytes of machine code.

Reviewed-by: Peter Hurley <peter@hurleysoftware.com>

Re: [PATCH 09/15] serial/pxa: Deinline wait_for_xmitr, save 165 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 141 bytes of machine code.

Reviewed-by: Peter Hurley <peter@hurleysoftware.com>

Re: [PATCH 06/15] serial/men_z135_uart: Deinline men_z135_reg_clr, save 176 bytes

[Peter Hurley]

On 10/27/2015 01:46 PM, Denys Vlasenko wrote:
> This function compiles to 98 bytes of machine code.

This looks ok because these function are heavyweight.

You'll want to add men_z135_reg_set() to this patch
as well, and please cc the driver author:

	Johannes Thumshirn <johannes.thumshirn@men.de>

Regards,
Peter Hurley


> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Peter Hurley <peter@hurleysoftware.com>
> CC: Jiri Slaby <jslaby@suse.com>
> CC: linux-serial@vger.kernel.org
> ---
>  drivers/tty/serial/men_z135_uart.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/men_z135_uart.c b/drivers/tty/serial/men_z135_uart.c
> index b90e7b3..2b5b66f 100644
> --- a/drivers/tty/serial/men_z135_uart.c
> +++ b/drivers/tty/serial/men_z135_uart.c
> @@ -159,7 +159,7 @@ static inline void men_z135_reg_set(struct men_z135_port *uart,
>   * @addr: Register address
>   * @val: value to clear
>   */
> -static inline void men_z135_reg_clr(struct men_z135_port *uart,
> +static void men_z135_reg_clr(struct men_z135_port *uart,
>  				u32 addr, u32 val)
>  {
>  	struct uart_port *port = &uart->port;
>