From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932747AbbJ1JNl (ORCPT ); Wed, 28 Oct 2015 05:13:41 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33641 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755177AbbJ1JMX (ORCPT ); Wed, 28 Oct 2015 05:12:23 -0400 From: Sudip Mukherjee To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 08/11] parport: remove unnecessary out of memory message Date: Wed, 28 Oct 2015 14:41:37 +0530 Message-Id: <1446023500-21292-9-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446023500-21292-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1446023500-21292-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If kmalloc() or kzalloc() fails we will get sufficient messages in the logs, no need to print these extra messages. Signed-off-by: Sudip Mukherjee --- drivers/parport/share.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/parport/share.c b/drivers/parport/share.c index 5dbd6f4..441333b 100644 --- a/drivers/parport/share.c +++ b/drivers/parport/share.c @@ -444,10 +444,8 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma, int ret; tmp = kzalloc(sizeof(struct parport), GFP_KERNEL); - if (!tmp) { - printk(KERN_WARNING "parport: memory squeeze\n"); + if (!tmp) return NULL; - } /* Init our structure */ tmp->base = base; @@ -473,7 +471,6 @@ struct parport *parport_register_port(unsigned long base, int irq, int dma, name = kmalloc(15, GFP_KERNEL); if (!name) { - printk(KERN_ERR "parport: memory squeeze\n"); kfree(tmp); return NULL; } @@ -741,16 +738,12 @@ parport_register_device(struct parport *port, const char *name, parport_get_port (port); tmp = kmalloc(sizeof(struct pardevice), GFP_KERNEL); - if (tmp == NULL) { - printk(KERN_WARNING "%s: memory squeeze, couldn't register %s.\n", port->name, name); + if (tmp == NULL) goto out; - } tmp->state = kmalloc(sizeof(struct parport_state), GFP_KERNEL); - if (tmp->state == NULL) { - printk(KERN_WARNING "%s: memory squeeze, couldn't register %s.\n", port->name, name); + if (tmp->state == NULL) goto out_free_pardevice; - } tmp->name = name; tmp->port = port; -- 1.9.1