Commit 3d43b7d5 authored by WANG Cong's avatar WANG Cong Committed by Greg Kroah-Hartman

cris: lower the printk level in cris serial driver

KERN_CRIT is too high, replace those KERN_CRIT with KERN_ERR or KERN_WARNING.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 06315348
...@@ -1788,7 +1788,7 @@ static unsigned int handle_descr_data(struct e100_serial *info, ...@@ -1788,7 +1788,7 @@ static unsigned int handle_descr_data(struct e100_serial *info,
struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer; struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
if (info->recv_cnt + recvl > 65536) { if (info->recv_cnt + recvl > 65536) {
printk(KERN_CRIT printk(KERN_WARNING
"%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl); "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl);
return 0; return 0;
} }
...@@ -3813,13 +3813,13 @@ rs_close(struct tty_struct *tty, struct file * filp) ...@@ -3813,13 +3813,13 @@ rs_close(struct tty_struct *tty, struct file * filp)
* one, we've got real problems, since it means the * one, we've got real problems, since it means the
* serial port won't be shutdown. * serial port won't be shutdown.
*/ */
printk(KERN_CRIT printk(KERN_ERR
"rs_close: bad serial port count; tty->count is 1, " "rs_close: bad serial port count; tty->count is 1, "
"info->count is %d\n", info->count); "info->count is %d\n", info->count);
info->count = 1; info->count = 1;
} }
if (--info->count < 0) { if (--info->count < 0) {
printk(KERN_CRIT "rs_close: bad serial port count for ttyS%d: %d\n", printk(KERN_ERR "rs_close: bad serial port count for ttyS%d: %d\n",
info->line, info->count); info->line, info->count);
info->count = 0; info->count = 0;
} }
...@@ -4452,7 +4452,7 @@ static int __init rs_init(void) ...@@ -4452,7 +4452,7 @@ static int __init rs_init(void)
#if defined(CONFIG_ETRAX_RS485_ON_PA) #if defined(CONFIG_ETRAX_RS485_ON_PA)
if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit, if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit,
rs485_pa_bit)) { rs485_pa_bit)) {
printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
"RS485 pin\n"); "RS485 pin\n");
put_tty_driver(driver); put_tty_driver(driver);
return -EBUSY; return -EBUSY;
...@@ -4461,7 +4461,7 @@ static int __init rs_init(void) ...@@ -4461,7 +4461,7 @@ static int __init rs_init(void)
#if defined(CONFIG_ETRAX_RS485_ON_PORT_G) #if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit, if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit,
rs485_port_g_bit)) { rs485_port_g_bit)) {
printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
"RS485 pin\n"); "RS485 pin\n");
put_tty_driver(driver); put_tty_driver(driver);
return -EBUSY; return -EBUSY;
...@@ -4494,7 +4494,7 @@ static int __init rs_init(void) ...@@ -4494,7 +4494,7 @@ static int __init rs_init(void)
if (info->enabled) { if (info->enabled) {
if (cris_request_io_interface(info->io_if, if (cris_request_io_interface(info->io_if,
info->io_if_description)) { info->io_if_description)) {
printk(KERN_CRIT "ETRAX100LX async serial: " printk(KERN_ERR "ETRAX100LX async serial: "
"Could not allocate IO pins for " "Could not allocate IO pins for "
"%s, port %d\n", "%s, port %d\n",
info->io_if_description, i); info->io_if_description, i);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment