Re: [PATCH 10/11] tty: serial: 8250: Replace printk by pr_*

[Peter Hurley <peter@hurleysoftware.com>]

Hi Anton,

On 12/16/2015 07:36 AM, Anton Wuerfel wrote:
> This patch replaces printk by the corresponding variant of pr_* in order to
> fix checkpatch warnings.

Comments below.

> 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  |  5 ++---
>  drivers/tty/serial/8250/8250_gsc.c   |  6 ++----
>  drivers/tty/serial/8250/8250_hp300.c | 14 +++++++-------
>  drivers/tty/serial/8250/8250_pnp.c   |  6 +++---
>  drivers/tty/serial/8250/8250_port.c  |  3 +--
>  5 files changed, 15 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
> index 2b3731f..b5e0c48 100644
> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -1095,9 +1095,8 @@ static int __init serial8250_init(void)
>  
>  	serial8250_isa_init_ports();
>  
> -	printk(KERN_INFO "Serial: 8250/16550 driver, "
> -		"%d ports, IRQ sharing %sabled\n", nr_uarts,
> -		share_irqs ? "en" : "dis");
> +	pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %sabled\n",
> +		nr_uarts, share_irqs ? "en" : "dis");
>  
>  #ifdef CONFIG_SPARC
>  	ret = sunserial_register_minors(&serial8250_reg, UART_NR);
> diff --git a/drivers/tty/serial/8250/8250_gsc.c b/drivers/tty/serial/8250/8250_gsc.c
> index 2e3ea1a..a9b63d0 100644
> --- a/drivers/tty/serial/8250/8250_gsc.c
> +++ b/drivers/tty/serial/8250/8250_gsc.c
> @@ -42,8 +42,7 @@ static int __init serial_init_chip(struct parisc_device *dev)
>  		 * the user what they're missing.
>  		 */
>  		if (parisc_parent(dev)->id.hw_type != HPHW_IOA)
> -			printk(KERN_INFO
> -				"Serial: device 0x%llx not configured.\n"
> +			pr_info("Serial: device 0x%llx not configured.\n"
>  				"Enable support for Wax, Lasi, Asp or Dino.\n",
>  				(unsigned long long)dev->hpa.start);
>  		return -ENODEV;
> @@ -66,8 +65,7 @@ static int __init serial_init_chip(struct parisc_device *dev)
>  
>  	err = serial8250_register_8250_port(&uart);
>  	if (err < 0) {
> -		printk(KERN_WARNING
> -			"serial8250_register_8250_port returned error %d\n", err);
> +		pr_warn("serial8250_register_8250_port returned error %d\n", err);
>  		iounmap(uart.port.membase);
>  		return err;
>  	}
> diff --git a/drivers/tty/serial/8250/8250_hp300.c b/drivers/tty/serial/8250/8250_hp300.c
> index 52c43da..85b574896 100644
> --- a/drivers/tty/serial/8250/8250_hp300.c
> +++ b/drivers/tty/serial/8250/8250_hp300.c
> @@ -110,7 +110,7 @@ int __init hp300_setup_serial_console(void)
>  	/* Check for APCI console */
>  	if (scode == 256) {
>  #ifdef CONFIG_HPAPCI
> -		printk(KERN_INFO "Serial console is HP APCI 1\n");
> +		pr_info("Serial console is HP APCI 1\n");
>  
>  		port.uartclk = HPAPCI_BAUD_BASE * 16;
>  		port.mapbase = (FRODO_BASE + FRODO_APCI_OFFSET(1));
> @@ -118,7 +118,7 @@ int __init hp300_setup_serial_console(void)
>  		port.regshift = 2;
>  		add_preferred_console("ttyS", port.line, "9600n8");
>  #else
> -		printk(KERN_WARNING "Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n");
> +		pr_warn("Serial console is APCI but support is disabled (CONFIG_HPAPCI)!\n");
>  		return 0;
>  #endif
>  	} else {
> @@ -128,7 +128,7 @@ int __init hp300_setup_serial_console(void)
>  		if (!pa)
>  			return 0;
>  
> -		printk(KERN_INFO "Serial console is HP DCA at select code %d\n", scode);
> +		pr_info("Serial console is HP DCA at select code %d\n", scode);
>  
>  		port.uartclk = HPDCA_BAUD_BASE * 16;
>  		port.mapbase = (pa + UART_OFFSET);
> @@ -142,13 +142,13 @@ int __init hp300_setup_serial_console(void)
>  		if (DIO_ID(pa + DIO_VIRADDRBASE) & 0x80)
>  			add_preferred_console("ttyS", port.line, "9600n8");
>  #else
> -		printk(KERN_WARNING "Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n");
> +		pr_warn("Serial console is DCA but support is disabled (CONFIG_HPDCA)!\n");
>  		return 0;
>  #endif
>  	}
>  
>  	if (early_serial_setup(&port) < 0)
> -		printk(KERN_WARNING "hp300_setup_serial_console(): early_serial_setup() failed.\n");
> +		pr_warn("hp300_setup_serial_console(): early_serial_setup() failed.\n");
>  	return 0;
>  }
>  #endif /* CONFIG_SERIAL_8250_CONSOLE */




> @@ -180,7 +180,7 @@ static int hpdca_init_one(struct dio_dev *d,
>  	line = serial8250_register_8250_port(&uart);
>  
>  	if (line < 0) {
> -		printk(KERN_NOTICE "8250_hp300: register_serial() DCA scode %d"
> +		pr_notice("8250_hp300: register_serial() DCA scode %d"
>  		       " irq %d failed\n", d->scode, uart.port.irq);
>  		return -ENOMEM;
>  	}
> @@ -261,7 +261,7 @@ static int __init hp300_8250_init(void)
>  		line = serial8250_register_8250_port(&uart);
>  
>  		if (line < 0) {
> -			printk(KERN_NOTICE "8250_hp300: register_serial() APCI"
> +			pr_notice("8250_hp300: register_serial() APCI"
>  			       " %d irq %d failed\n", i, uart.port.irq);

Missed these multi-line strings in your previous patch
"tty: serial: 8250: Fix multi-line strings"


>  			kfree(port);
>  			continue;
> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
> index 2731031..3811c67 100644
> --- a/drivers/tty/serial/8250/8250_pnp.c
> +++ b/drivers/tty/serial/8250/8250_pnp.c
> @@ -465,9 +465,9 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
>  		return -ENODEV;
>  
>  #ifdef SERIAL_DEBUG_PNP
> -	printk(KERN_DEBUG
> -		"Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
> -		       uart.port.iobase, uart.port.mapbase, uart.port.irq, uart.port.iotype);
> +	pr_debug("Setup PNP port: port %x, mem 0x%lx, irq %d, type %d\n",
> +		 uart.port.iobase, uart.port.mapbase,
> +		 uart.port.irq, uart.port.iotype);

Note that printk(KERN_DEBUG) and pr_debug() have different behavior;
you should note what the behavioral difference is in the changelog.


>  #endif
>  	if (flags & CIR_PORT) {
>  		uart.port.flags |= UPF_FIXED_PORT | UPF_FIXED_TYPE;
> diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
> index 0ec823e..1b2aaf9 100644
> --- a/drivers/tty/serial/8250/8250_port.c
> +++ b/drivers/tty/serial/8250/8250_port.c
> @@ -1222,8 +1222,7 @@ static void autoconfig(struct uart_8250_port *up)
>  out_lock:
>  	spin_unlock_irqrestore(&port->lock, flags);
>  	if (up->capabilities != old_capabilities) {
> -		printk(KERN_WARNING
> -		       "ttyS%d: detected caps %08x should be %08x\n",
> +		pr_warn("ttyS%d: detected caps %08x should be %08x\n",
>  		       serial_index(port), old_capabilities,
>  		       up->capabilities);
>  	}
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html