RE: [PATCH 2/2] drivers/serial/bfin_5xx.c: Use pr_<level> and pr_<fmt>

[Zhang, Sonic]

>-----Original Message-----
>From: Joe Perches [mailto:joe@xxxxxxxxxxx] 
>Sent: Tuesday, August 24, 2010 3:02 AM
>To: linux-kernel@xxxxxxxxxxxxxxx
>Cc: Zhang, Sonic; uclinux-dist-devel@xxxxxxxxxxxxxxxxxxxx
>Subject: [PATCH 2/2] drivers/serial/bfin_5xx.c: Use pr_<level> 
>and pr_<fmt>
>
>Also fix typo of length.
>
>Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
>---
> drivers/serial/bfin_5xx.c |   29 ++++++++++++++---------------
> 1 files changed, 14 insertions(+), 15 deletions(-)
>
>diff --git a/drivers/serial/bfin_5xx.c 
>b/drivers/serial/bfin_5xx.c index 4e38f99..4c01ee6 100644
>--- a/drivers/serial/bfin_5xx.c
>+++ b/drivers/serial/bfin_5xx.c
>@@ -8,6 +8,8 @@
>  * Licensed under the GPL-2 or later.
>  */
> 
>+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>+
> #if defined(CONFIG_SERIAL_BFIN_CONSOLE) && 
>defined(CONFIG_MAGIC_SYSRQ)  #define SUPPORT_SYSRQ  #endif @@ 
>-631,12 +633,12 @@ static int bfin_serial_startup(struct 
>uart_port *port)
> 	dma_addr_t dma_handle;
> 
> 	if (request_dma(uart->rx_dma_channel, "BFIN_UART_RX") < 0) {
>-		printk(KERN_NOTICE "Unable to attach Blackfin 
>UART RX DMA channel\n");
>+		pr_notice("Unable to attach Blackfin UART RX 
>DMA channel\n");
> 		return -EBUSY;
> 	}
> 
> 	if (request_dma(uart->tx_dma_channel, "BFIN_UART_TX") < 0) {
>-		printk(KERN_NOTICE "Unable to attach Blackfin 
>UART TX DMA channel\n");
>+		pr_notice("Unable to attach Blackfin UART TX 
>DMA channel\n");
> 		free_dma(uart->rx_dma_channel);
> 		return -EBUSY;
> 	}
>@@ -674,14 +676,14 @@ static int bfin_serial_startup(struct 
>uart_port *port)  # endif
> 	if (request_irq(uart->port.irq, bfin_serial_rx_int, 
>IRQF_DISABLED,
> 	     "BFIN_UART_RX", uart)) {
>-		printk(KERN_NOTICE "Unable to attach BlackFin 
>UART RX interrupt\n");
>+		pr_notice("Unable to attach BlackFin UART RX 
>interrupt\n");
> 		return -EBUSY;
> 	}
> 
> 	if (request_irq
> 	    (uart->port.irq+1, bfin_serial_tx_int, IRQF_DISABLED,
> 	     "BFIN_UART_TX", uart)) {
>-		printk(KERN_NOTICE "Unable to attach BlackFin 
>UART TX interrupt\n");
>+		pr_notice("Unable to attach BlackFin UART TX 
>interrupt\n");
> 		free_irq(uart->port.irq, uart);
> 		return -EBUSY;
> 	}
>@@ -706,14 +708,14 @@ static int bfin_serial_startup(struct 
>uart_port *port)
> 
> 		if (uart_dma_ch_rx &&
> 			request_dma(uart_dma_ch_rx, 
>"BFIN_UART_RX") < 0) {
>-			printk(KERN_NOTICE"Fail to attach UART 
>interrupt\n");
>+			pr_notice("Fail to attach UART interrupt\n");
> 			free_irq(uart->port.irq, uart);
> 			free_irq(uart->port.irq + 1, uart);
> 			return -EBUSY;
> 		}
> 		if (uart_dma_ch_tx &&
> 			request_dma(uart_dma_ch_tx, 
>"BFIN_UART_TX") < 0) {
>-			printk(KERN_NOTICE "Fail to attach UART 
>interrupt\n");
>+			pr_notice("Fail to attach UART interrupt\n");
> 			free_dma(uart_dma_ch_rx);
> 			free_irq(uart->port.irq, uart);
> 			free_irq(uart->port.irq + 1, uart);
>@@ -734,8 +736,7 @@ static int bfin_serial_startup(struct 
>uart_port *port)
> 			IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING |
> 			IRQF_DISABLED, "BFIN_UART_CTS", uart)) {
> 			uart->cts_pin = -1;
>-			pr_info("Unable to attach BlackFin UART 
>CTS interrupt. "
>-				"So, disable it.\n");
>+			pr_info("Unable to attach BlackFin UART 
>CTS interrupt. So, disable 
>+it.\n");
> 		}
> 	}
> 	if (uart->rts_pin >= 0) {
>@@ -747,8 +748,7 @@ static int bfin_serial_startup(struct 
>uart_port *port)
> 	if (request_irq(uart->status_irq,
> 		bfin_serial_mctrl_cts_int,
> 		IRQF_DISABLED, "BFIN_UART_MODEM_STATUS", uart)) {
>-		pr_info("Unable to attach BlackFin UART Modem "
>-			"Status interrupt.\n");
>+		pr_info("Unable to attach BlackFin UART Modem 
>Status interrupt\n");

I don't this this change is necessary.

> 	}
> 
> 	/* CTS RTS PINs are negative assertive. */ @@ -825,8 
>+825,7 @@ bfin_serial_set_termios(struct uart_port *port, 
>struct ktermios *termios,
> 		lcr = WLS(5);
> 		break;
> 	default:
>-		printk(KERN_ERR "%s: word lengh not supported\n",
>-			__func__);
>+		pr_err("%s: word length not supported\n", __func__);
> 	}
> 
> 	/* Anomaly notes:
>@@ -834,8 +833,7 @@ bfin_serial_set_termios(struct uart_port 
>*port, struct ktermios *termios,
> 	 */
> 	if (termios->c_cflag & CSTOPB) {
> 		if (ANOMALY_05000231)
>-			printk(KERN_WARNING "STOP bits other 
>than 1 is not "
>-				"supported in case of anomaly 
>05000231.\n");
>+			pr_warning("STOP bits other than 1 is 
>not supported in case of 
>+anomaly 05000231\n");

How about following style?

			pr_warning( "STOP bits other than 1 is not "
				"supported in case of anomaly
05000231.\n");


Sonic Zhang

> 		else
> 			lcr |= STB;
> 	}
>@@ -1188,7 +1186,8 @@ bfin_serial_console_get_options(struct 
>bfin_serial_port *uart, int *baud,
> 
> 		*baud = get_sclk() / (16*(dll | dlh << 8));
> 	}
>-	pr_debug("%s:baud = %d, parity = %c, bits= %d\n", 
>__func__, *baud, *parity, *bits);
>+	pr_debug("%s:baud = %d, parity = %c, bits= %d\n",
>+		 __func__, *baud, *parity, *bits);
> }
> 
> static struct uart_driver bfin_serial_reg;
>--
>1.7.2.19.g9a302
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/