| From 8a9fcc46f87a1b0d310bbbbdc5dd19c537997ec9 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Date: Tue, 11 Mar 2014 11:11:17 +0100 |
| Subject: serial: sh-sci: Replace printk() by pr_*() |
| |
| Make banner const while we're at it |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org> |
| Acked-by: Simon Horman <horms@verge.net.au> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| (cherry picked from commit 6c13d5d27c5ecd7a2ce7c104c7726b0d7aa7d7b5) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/tty/serial/sh-sci.c | 7 +++---- |
| 1 file changed, 3 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c |
| index 0cb52376f97d..60a8f7db2948 100644 |
| --- a/drivers/tty/serial/sh-sci.c |
| +++ b/drivers/tty/serial/sh-sci.c |
| @@ -428,7 +428,7 @@ static int sci_probe_regmap(struct plat_sci_port *cfg) |
| cfg->regtype = SCIx_HSCIF_REGTYPE; |
| break; |
| default: |
| - printk(KERN_ERR "Can't probe register map for given port\n"); |
| + pr_err("Can't probe register map for given port\n"); |
| return -EINVAL; |
| } |
| |
| @@ -2389,8 +2389,7 @@ static inline int sci_probe_earlyprintk(struct platform_device *pdev) |
| |
| #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */ |
| |
| -static char banner[] __initdata = |
| - KERN_INFO "SuperH (H)SCI(F) driver initialized\n"; |
| +static const char banner[] __initconst = "SuperH (H)SCI(F) driver initialized"; |
| |
| static struct uart_driver sci_uart_driver = { |
| .owner = THIS_MODULE, |
| @@ -2616,7 +2615,7 @@ static int __init sci_init(void) |
| { |
| int ret; |
| |
| - printk(banner); |
| + pr_info("%s\n", banner); |
| |
| ret = uart_register_driver(&sci_uart_driver); |
| if (likely(ret == 0)) { |
| -- |
| 2.1.2 |
| |
