lkml.org 
[lkml]   [2015]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 1/1] staging: io: Remove unnecessary OOM message
This patch reduces the kernel size by removing error messages that duplicate
the normal OOM message.

Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
---
drivers/staging/i2o/i2o_block.c | 1 -
drivers/staging/i2o/i2o_config.c | 7 +------
drivers/staging/i2o/iop.c | 10 ++--------
3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/staging/i2o/i2o_block.c b/drivers/staging/i2o/i2o_block.c
index 0a13c64..a26e2a0 100644
--- a/drivers/staging/i2o/i2o_block.c
+++ b/drivers/staging/i2o/i2o_block.c
@@ -965,7 +965,6 @@ static struct i2o_block_device *i2o_block_device_alloc(void)

dev = kzalloc(sizeof(*dev), GFP_KERNEL);
if (!dev) {
- osm_err("Insufficient memory to allocate I2O Block disk.\n");
rc = -ENOMEM;
goto exit;
}
diff --git a/drivers/staging/i2o/i2o_config.c b/drivers/staging/i2o/i2o_config.c
index 5748663..29e90e2 100644
--- a/drivers/staging/i2o/i2o_config.c
+++ b/drivers/staging/i2o/i2o_config.c
@@ -591,11 +591,8 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,

rcode = -ENOMEM;
reply = kzalloc(reply_size, GFP_KERNEL);
- if (!reply) {
- printk(KERN_WARNING "%s: Could not allocate reply buffer\n",
- c->name);
+ if (!reply)
goto out;
- }

sg_offset = (msg->u.head[0] >> 4) & 0x0f;

@@ -833,8 +830,6 @@ static int i2o_cfg_passthru(unsigned long arg)

reply = kzalloc(reply_size, GFP_KERNEL);
if (!reply) {
- printk(KERN_WARNING "%s: Could not allocate reply buffer\n",
- c->name);
rcode = -ENOMEM;
goto out;
}
diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
index 52334fc..47c785c 100644
--- a/drivers/staging/i2o/iop.c
+++ b/drivers/staging/i2o/iop.c
@@ -99,11 +99,8 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
c->name);

entry = kmalloc(sizeof(*entry), GFP_ATOMIC);
- if (!entry) {
- osm_err("%s: Could not allocate memory for context list element"
- "\n", c->name);
+ if (!entry)
return 0;
- }

entry->ptr = ptr;
entry->timestamp = jiffies;
@@ -1047,11 +1044,8 @@ struct i2o_controller *i2o_iop_alloc(void)
char poolname[32];

c = kzalloc(sizeof(*c), GFP_KERNEL);
- if (!c) {
- osm_err("i2o: Insufficient memory to allocate a I2O controller."
- "\n");
+ if (!c)
return ERR_PTR(-ENOMEM);
- }

c->unit = unit++;
sprintf(c->name, "iop%d", c->unit);
--
1.9.1


\
 
 \ /
  Last update: 2015-03-05 11:41    [W:0.032 / U:0.312 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site