From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org,
Chas Williams <3chas3@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/4] atm: idt77252: Delete an error message for a failed memory allocation in seven functions
Date: Sat, 5 Aug 2017 14:28:20 +0200 [thread overview]
Message-ID: <845a4e7c-fccc-a81b-cff5-3962e3cac155@users.sourceforge.net> (raw)
In-Reply-To: <df946de6-8112-2a23-ec98-ac6418ca8486@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 5 Aug 2017 12:45: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/atm/idt77252.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 6a051f5909d0..434dc4ee5f15 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -1307,8 +1307,6 @@ idt77252_rx_raw(struct idt77252_dev *card)
sb = dev_alloc_skb(64);
if (!sb) {
- printk("%s: Can't allocate buffers for AAL0.\n",
- card->name);
atomic_inc(&vcc->stats->rx_err);
goto drop;
}
@@ -2007,7 +2005,6 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
skb = dev_alloc_skb(64);
if (!skb) {
- printk("%s: Out of memory in send_oam().\n", card->name);
atomic_inc(&vcc->stats->tx_err);
return -ENOMEM;
}
@@ -2427,7 +2424,6 @@ idt77252_open(struct atm_vcc *vcc)
if (!card->vcs[index]) {
card->vcs[index] = kzalloc(sizeof(struct vc_map), GFP_KERNEL);
if (!card->vcs[index]) {
- printk("%s: can't alloc vc in open()\n", card->name);
mutex_unlock(&card->mutex);
return -ENOMEM;
}
@@ -2857,10 +2853,9 @@ open_card_oam(struct idt77252_dev *card)
index = VPCI2VC(card, vpi, vci);
vc = kzalloc(sizeof(struct vc_map), GFP_KERNEL);
- if (!vc) {
- printk("%s: can't alloc vc\n", card->name);
+ if (!vc)
return -ENOMEM;
- }
+
vc->index = index;
card->vcs[index] = vc;
@@ -2924,10 +2919,9 @@ open_card_ubr0(struct idt77252_dev *card)
struct vc_map *vc;
vc = kzalloc(sizeof(struct vc_map), GFP_KERNEL);
- if (!vc) {
- printk("%s: can't alloc vc\n", card->name);
+ if (!vc)
return -ENOMEM;
- }
+
card->vcs[0] = vc;
vc->class = SCHED_UBR0;
@@ -3410,7 +3404,6 @@ static int init_card(struct atm_dev *dev)
IPRINTK("%s: allocate %d byte for VC map.\n", card->name, size);
card->vcs = vzalloc(size);
if (!card->vcs) {
- printk("%s: memory allocation failure.\n", card->name);
deinit_card(card);
return -1;
}
@@ -3420,7 +3413,6 @@ static int init_card(struct atm_dev *dev)
card->name, size);
card->scd2vc = vzalloc(size);
if (!card->scd2vc) {
- printk("%s: memory allocation failure.\n", card->name);
deinit_card(card);
return -1;
}
@@ -3430,7 +3422,6 @@ static int init_card(struct atm_dev *dev)
card->name, size);
card->soft_tst = vmalloc(size);
if (!card->soft_tst) {
- printk("%s: memory allocation failure.\n", card->name);
deinit_card(card);
return -1;
}
@@ -3616,7 +3607,6 @@ static int idt77252_init_one(struct pci_dev *pcidev,
card = kzalloc(sizeof(struct idt77252_dev), GFP_KERNEL);
if (!card) {
- printk("idt77252-%d: can't allocate private data\n", index);
err = -ENOMEM;
goto err_out_disable_pdev;
}
--
2.13.4
next prev parent reply other threads:[~2017-08-05 12:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-05 12:24 [PATCH 0/4] atm: idt77252: Adjustments for some function implementations SF Markus Elfring
2017-08-05 12:26 ` [PATCH 1/4] atm: idt77252: Adjust four function calls together with a variable assignment SF Markus Elfring
2017-08-05 12:28 ` SF Markus Elfring [this message]
2017-08-06 19:06 ` [PATCH 2/4] atm: idt77252: Delete an error message for a failed memory allocation in seven functions kbuild test robot
2017-08-05 12:30 ` [PATCH 3/4] atm: idt77252: Improve seven size determinations SF Markus Elfring
2017-08-05 12:32 ` [PATCH 4/4] atm: idt77252: Adjust ten checks for null pointers SF Markus Elfring
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=845a4e7c-fccc-a81b-cff5-3962e3cac155@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=3chas3@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).