aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2011-09-01 04:47:49 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-09-22 18:51:30 -0400
commit3d43b7d59d2cb9171ad5abd830fa094fa3dbb9b8 (patch)
tree89a3f541b00bb2a726c58983b361215fbbbb56f3 /drivers/tty/serial
parent06315348b16178e4c006e7892ef8e5e65f49c66a (diff)
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: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/crisv10.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 58be715913cd..a931524629f9 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -1788,7 +1788,7 @@ static unsigned int handle_descr_data(struct e100_serial *info,
1788 struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer; 1788 struct etrax_recv_buffer *buffer = phys_to_virt(descr->buf) - sizeof *buffer;
1789 1789
1790 if (info->recv_cnt + recvl > 65536) { 1790 if (info->recv_cnt + recvl > 65536) {
1791 printk(KERN_CRIT 1791 printk(KERN_WARNING
1792 "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl); 1792 "%s: Too much pending incoming serial data! Dropping %u bytes.\n", __func__, recvl);
1793 return 0; 1793 return 0;
1794 } 1794 }
@@ -3813,13 +3813,13 @@ rs_close(struct tty_struct *tty, struct file * filp)
3813 * one, we've got real problems, since it means the 3813 * one, we've got real problems, since it means the
3814 * serial port won't be shutdown. 3814 * serial port won't be shutdown.
3815 */ 3815 */
3816 printk(KERN_CRIT 3816 printk(KERN_ERR
3817 "rs_close: bad serial port count; tty->count is 1, " 3817 "rs_close: bad serial port count; tty->count is 1, "
3818 "info->count is %d\n", info->count); 3818 "info->count is %d\n", info->count);
3819 info->count = 1; 3819 info->count = 1;
3820 } 3820 }
3821 if (--info->count < 0) { 3821 if (--info->count < 0) {
3822 printk(KERN_CRIT "rs_close: bad serial port count for ttyS%d: %d\n", 3822 printk(KERN_ERR "rs_close: bad serial port count for ttyS%d: %d\n",
3823 info->line, info->count); 3823 info->line, info->count);
3824 info->count = 0; 3824 info->count = 0;
3825 } 3825 }
@@ -4452,7 +4452,7 @@ static int __init rs_init(void)
4452#if defined(CONFIG_ETRAX_RS485_ON_PA) 4452#if defined(CONFIG_ETRAX_RS485_ON_PA)
4453 if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit, 4453 if (cris_io_interface_allocate_pins(if_serial_0, 'a', rs485_pa_bit,
4454 rs485_pa_bit)) { 4454 rs485_pa_bit)) {
4455 printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " 4455 printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
4456 "RS485 pin\n"); 4456 "RS485 pin\n");
4457 put_tty_driver(driver); 4457 put_tty_driver(driver);
4458 return -EBUSY; 4458 return -EBUSY;
@@ -4461,7 +4461,7 @@ static int __init rs_init(void)
4461#if defined(CONFIG_ETRAX_RS485_ON_PORT_G) 4461#if defined(CONFIG_ETRAX_RS485_ON_PORT_G)
4462 if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit, 4462 if (cris_io_interface_allocate_pins(if_serial_0, 'g', rs485_pa_bit,
4463 rs485_port_g_bit)) { 4463 rs485_port_g_bit)) {
4464 printk(KERN_CRIT "ETRAX100LX serial: Could not allocate " 4464 printk(KERN_ERR "ETRAX100LX serial: Could not allocate "
4465 "RS485 pin\n"); 4465 "RS485 pin\n");
4466 put_tty_driver(driver); 4466 put_tty_driver(driver);
4467 return -EBUSY; 4467 return -EBUSY;
@@ -4494,7 +4494,7 @@ static int __init rs_init(void)
4494 if (info->enabled) { 4494 if (info->enabled) {
4495 if (cris_request_io_interface(info->io_if, 4495 if (cris_request_io_interface(info->io_if,
4496 info->io_if_description)) { 4496 info->io_if_description)) {
4497 printk(KERN_CRIT "ETRAX100LX async serial: " 4497 printk(KERN_ERR "ETRAX100LX async serial: "
4498 "Could not allocate IO pins for " 4498 "Could not allocate IO pins for "
4499 "%s, port %d\n", 4499 "%s, port %d\n",
4500 info->io_if_description, i); 4500 info->io_if_description, i);