From: SF Markus Elfring <elfring@users.sourceforge.net>
To: Tim Waugh <tim@cyberelk.net>, kernel-janitors@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] paride: Delete an error message for a failed memory allocation in two functions
Date: Mon, 7 Aug 2017 11:23:53 +0200 [thread overview]
Message-ID: <46377d4f-aaab-a91f-9f39-f67ea98ba8ed@users.sourceforge.net> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 7 Aug 2017 11:11:34 +0200
Omit an extra message for a memory allocation failure in these functions.
This issue was detected by using the Coccinelle software.
Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/block/paride/pg.c | 1 -
drivers/block/paride/pt.c | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 3b5882bfb736..9b036c79c49e 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -550,7 +550,6 @@ static int pg_open(struct inode *inode, struct file *file)
dev->bufptr = kmalloc(PG_MAX_DATA, GFP_KERNEL);
if (dev->bufptr == NULL) {
clear_bit(0, &dev->access);
- printk("%s: buffer allocation failed\n", dev->name);
ret = -ENOMEM;
goto out;
}
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index e815312a00ad..33347853b7d4 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -687,10 +687,8 @@ static int pt_open(struct inode *inode, struct file *file)
err = -ENOMEM;
tape->bufptr = kmalloc(PT_BUFSIZE, GFP_KERNEL);
- if (tape->bufptr == NULL) {
- printk("%s: buffer allocation failed\n", tape->name);
+ if (!tape->bufptr)
goto out;
- }
file->private_data = tape;
mutex_unlock(&pt_mutex);
--
2.13.4
reply other threads:[~2017-08-07 9:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=46377d4f-aaab-a91f-9f39-f67ea98ba8ed@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tim@cyberelk.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®