diff mbox

[v5,09/15] tty: serial: 8250: Fix multi-line strings

Message ID 1452703171-5632-10-git-send-email-anton.wuerfel@fau.de (mailing list archive)
State Awaiting Upstream
Headers show

Commit Message

Anton Wuerfel Jan. 13, 2016, 4:39 p.m. UTC 
Merged user-visible multi-line strings into a single line according to the
Linux Kernel Coding Style, which allows user-visible strings to exceed the
maximum line length of 80 characters. The main reason for this is to
facilitate grepping for these strings.
However, some strings were ignored in this patch, because the use of
format specifiers breaks the ability to grep anyway.

Signed-off-by: Anton Würfel <anton.wuerfel@fau.de>
Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de>
Cc: linux-kernel@i4.cs.fau.de
---
 drivers/tty/serial/8250/8250_core.c | 3 +--
 drivers/tty/serial/8250/serial_cs.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

Comments

Andy Shevchenko Jan. 13, 2016, 5:08 p.m. UTC | #1 
On Wed, 2016-01-13 at 17:39 +0100, Anton Wuerfel wrote:
> Merged user-visible multi-line strings into a single line according
> to the
> Linux Kernel Coding Style, which allows user-visible strings to
> exceed the
> maximum line length of 80 characters. The main reason for this is to
> facilitate grepping for these strings.
> However, some strings were ignored in this patch, because the use of
> format specifiers breaks the ability to grep anyway.
> 

> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -1173,8 +1173,7 @@ MODULE_LICENSE("GPL");
>  MODULE_DESCRIPTION("Generic 8250/16x50 serial driver");
>  
>  module_param(share_irqs, uint, 0644);
> -MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50
> devices"
> -	" (unsafe)");
> +MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50
> devices (unsafe)");

This one looks nice in one line.

> --- a/drivers/tty/serial/8250/serial_cs.c
> +++ b/drivers/tty/serial/8250/serial_cs.c
> @@ -533,8 +533,7 @@ static int multi_config(struct pcmcia_device
> *link)
>  		info->multi = 2;
>  		if (pcmcia_loop_config(link,
> multi_config_check_notpicky,
>  				       &base2)) {
> -			dev_warn(&link->dev, "no usable port range "
> -			       "found, giving up\n");
> +			dev_warn(&link->dev, "no usable port range
> found, giving up\n");

But here I would comment as in patch 5, i.e. move literal to next line
it it doesn't fit on the dev_warn() line.
diff mbox

Patch

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index d042ad5..b60b58b 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -1173,8 +1173,7 @@  MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Generic 8250/16x50 serial driver");
 
 module_param(share_irqs, uint, 0644);
-MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices"
-	" (unsafe)");
+MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices (unsafe)");
 
 module_param(nr_uarts, uint, 0644);
 MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")");
diff --git a/drivers/tty/serial/8250/serial_cs.c b/drivers/tty/serial/8250/serial_cs.c
index 1f34867..1ab6bfc 100644
--- a/drivers/tty/serial/8250/serial_cs.c
+++ b/drivers/tty/serial/8250/serial_cs.c
@@ -533,8 +533,7 @@  static int multi_config(struct pcmcia_device *link)
 		info->multi = 2;
 		if (pcmcia_loop_config(link, multi_config_check_notpicky,
 				       &base2)) {
-			dev_warn(&link->dev, "no usable port range "
-			       "found, giving up\n");
+			dev_warn(&link->dev, "no usable port range found, giving up\n");
 			return -ENODEV;
 		}
 	}