From: Quentin Lambert <lambert.quentin@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: kernel-janitors@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] staging: io: Remove unnecessary OOM message
Date: Thu, 05 Mar 2015 10:23:16 +0000 [thread overview]
Message-ID: <20150305102316.GA4389@sloth> (raw)
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
WARNING: multiple messages have this Message-ID (diff)
From: Quentin Lambert <lambert.quentin@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: kernel-janitors@vger.kernel.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/1] staging: io: Remove unnecessary OOM message
Date: Thu, 5 Mar 2015 11:23:16 +0100 [thread overview]
Message-ID: <20150305102316.GA4389@sloth> (raw)
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
next reply other threads:[~2015-03-05 10:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-05 10:23 Quentin Lambert [this message]
2015-03-05 10:23 ` [PATCH 1/1] staging: io: Remove unnecessary OOM message Quentin Lambert
2015-03-05 10:28 ` Julia Lawall
2015-03-05 10:28 ` Julia Lawall
2015-03-05 10:54 ` Quentin Lambert
2015-03-05 10:54 ` Quentin Lambert
2015-03-05 10:56 ` Julia Lawall
2015-03-05 10:56 ` Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150305102316.GA4389@sloth \
--to=lambert.quentin@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.