From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752043AbdHEM2b (ORCPT ); Sat, 5 Aug 2017 08:28:31 -0400 Received: from mout.web.de ([212.227.17.12]:57573 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226AbdHEM23 (ORCPT ); Sat, 5 Aug 2017 08:28:29 -0400 Subject: [PATCH 2/4] atm: idt77252: Delete an error message for a failed memory allocation in seven functions From: SF Markus Elfring To: linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, Chas Williams <3chas3@gmail.com> Cc: LKML , kernel-janitors@vger.kernel.org References: Message-ID: <845a4e7c-fccc-a81b-cff5-3962e3cac155@users.sourceforge.net> Date: Sat, 5 Aug 2017 14:28:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:9s/1f9mnX5N2CYFUPPPQovhGMNr4S0mnhXEPxUyw3jQYA5avy38 ticN+5h++ffFMWc2/cynIouFaUJ+vnL3SIbbowtF0XrZVOIHL776QEPdT0ePKcW+OVnNFFJ WN4H4WDKSbAOObjzBd89IT2j7g2fDJjUCAL/YGcS0kkr0keKJvjdF5gAOYitW/uskVTh/M2 z6GJccdTggauJ46lGtU3w== X-UI-Out-Filterresults: notjunk:1;V01:K0:2uHgLPl+GBk=:LTAvC0ihKYWHpXuY7y9Zik DNZpXB2cJFygYCOkvmyMugqfu8ytTtVmijypuiTVStxtTS2XfqEwlw5svULeydjgayDVknklB mDJrBgj7061Hcooaz5ZwyYXf8u9sDkjYFGrcFiKrgEMQ49Pbs4apqib1UWE916mcmxrFGCgXf Vb6xp5+qU95EAfcN5MSF4JhH0PmYS+2OFr5Hm7dV3gDCZ5dGkDKuGVbiizyXTJ/GAlUooll22 0ScqIC4gsW/ju5DwOzoouezoolUxr9yjgi8NeBqzEIJ5abL32zVlnGwVk1jcm8G5P4CBZScOI URn5G98B3SeJ8WcexuehD3kwVgmi5XLo6h7bNz8DfnwuczUfM66MwwbI5+FTQKegMlRaZlVX4 hXIWpOI1VXnKo5BRi8qb3h4SRc3/B+hIKsofexSTJrCdlqXF9tSWQB1P5yFuEKAX03LG6dU/1 sArBmeaXfB6na8pNxT+B3lQh6NvfTnIe4Fakt235bdObrMFRYyMnmrhHzXC2KPZTqQ+3e8EdQ OrIj0QIt3WA2Ev6j/teonFmu7zPf2T41QdxoTyOUhlkAsD5XW1NkPChl1hlXZa0oepcoivTpX Xwc4Tl5Y8622nPG+obkaVvNNUM+dqRRjUn0q2bO9qgkb3dPP5ymiDFHuvRfIuNlsTu8q/nHnL CqgKsa8typi99l0CPX42nFshRGdTK0zk1+l8ohI2jzwHjSF41BLDrC76fiAMo6SFWESrCUV6/ rrG+yvTOtJpx3KHq45PlTj2xrFpFS/B1tdldl4Cgr0/Q3QCYGwMFGC9C1atqmg5b9VzUagN4h l9tYqHjOpDeL0glk1fb8zuBYqmWcOE/cu1zBM2z//KWynmYnMY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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