From 361746264b5e875e9b3c6f5b844accfe629e28bb Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 25 Apr 2014 11:02:13 +0200 Subject: tty: n_hdlc: Drop redundant error message On initialization failure, an error message is already printed with level KERN_ERR, no need to print another one with level KERN_INFO. Signed-off-by: Jean Delvare Cc: Jiri Slaby Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_hdlc.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/tty/n_hdlc.c') diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c index 1b2db9a3038..ef42942a939 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c @@ -952,8 +952,6 @@ static char hdlc_register_ok[] __initdata = KERN_INFO "N_HDLC line discipline registered.\n"; static char hdlc_register_fail[] __initdata = KERN_ERR "error registering line discipline: %d\n"; -static char hdlc_init_fail[] __initdata = - KERN_INFO "N_HDLC: init failure %d\n"; static int __init n_hdlc_init(void) { @@ -973,8 +971,6 @@ static int __init n_hdlc_init(void) else printk(hdlc_register_fail, status); - if (status) - printk(hdlc_init_fail, status); return status; } /* end of init_module() */ -- cgit v1.2.3-70-g09d2 From 8e25f8ce0e3227f20090f1b89b908d8146304413 Mon Sep 17 00:00:00 2001 From: Fabian Frederick Date: Mon, 26 May 2014 21:32:42 +0200 Subject: drivers/tty/n_hdlc.c: replace kmalloc/memset by kzalloc Cc: Greg Kroah-Hartman Signed-off-by: Fabian Frederick Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_hdlc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/tty/n_hdlc.c') diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c index ef42942a939..644ddb841d9 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c @@ -848,13 +848,11 @@ static struct n_hdlc *n_hdlc_alloc(void) { struct n_hdlc_buf *buf; int i; - struct n_hdlc *n_hdlc = kmalloc(sizeof(*n_hdlc), GFP_KERNEL); + struct n_hdlc *n_hdlc = kzalloc(sizeof(*n_hdlc), GFP_KERNEL); if (!n_hdlc) return NULL; - memset(n_hdlc, 0, sizeof(*n_hdlc)); - n_hdlc_buf_list_init(&n_hdlc->rx_free_buf_list); n_hdlc_buf_list_init(&n_hdlc->tx_free_buf_list); n_hdlc_buf_list_init(&n_hdlc->rx_buf_list); -- cgit v1.2.3-70-g09d2