diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-10-28 14:41:37 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-03 16:32:59 -0800 |
| commit | 47ec57ec0e52839b92066567e6eb02fb1e60e603 (patch) | |
| tree | 4bdaeb28392266b263aac3cc30b18e9e5642a010 | |
| parent | 13efa75d4e5d467f685bd54df310919ae4dc8eac (diff) | |
parport: remove unnecessary out of memory message
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 <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/parport/share.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/parport/share.c b/drivers/parport/share.c index 5dbd6f434a91..441333bd4839 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; |