From patchwork Sun Aug 6 06:28:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 798334 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xQ9j727f4z9t2J for ; Sun, 6 Aug 2017 16:28:43 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbdHFG2b (ORCPT ); Sun, 6 Aug 2017 02:28:31 -0400 Received: from mout.web.de ([217.72.192.78]:49448 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751179AbdHFG2a (ORCPT ); Sun, 6 Aug 2017 02:28:30 -0400 Received: from [192.168.1.2] ([78.49.229.221]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MgfFr-1dyuSx1x1r-00O1jw; Sun, 06 Aug 2017 08:28:20 +0200 Subject: [PATCH 2/3] ATM-iphase: Delete five error messages for a failed memory allocation 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: Date: Sun, 6 Aug 2017 08:28:19 +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-Language: en-GB X-Provags-ID: V03:K0:Y11mU33Aj0f+taE06Or21X0JiH7Ek/PYP6roizgFH4CRXJcWNAm 0I7wGIW3OcD4hrWf2povBgD4HlNitu/YE56NqHuJR1/lZzSZ2U0V9A3OX+R34CGcZ0iBzE8 R8iZr9xw/Axi4CvBLDjoAgJVmwcIrTVW9g3Na14E7y9QU8S4/Owl1Fupulcci+FJi2s+GNK oDYsjfu222z95LRRLIcPg== X-UI-Out-Filterresults: notjunk:1; V01:K0:0hVsmd7kmOA=:K9IXDb+0r+PMmql1z9NFpf AwXmytUvOPxaoOTnmWNmT68lq3VZ0S/wYfUHGz83rfsH4+pXApiEPMNd2LHUPW7kHjzwSg5oZ O5U5Cx/6gI7CdVpgDfzGG1ClWkq2pGzEuir4KWlu5cJyyKdfgjds4qNPjh2MxvzV0EHFhyw7o wAainROeuUOYb/YJjmQHuz7tYRX6Suta3tCLpYHW5gxSWuZumR3KkxdqQAjx4oIloRA4jvpER 8Q+xoVDJBHNdDUK6H+MNiv3UUEBT/QhatQKmxh4TR7HPQaec5tCCD4aNN8CuHqP33lUDaFR+U xxIZafjupbScWvF797SoVqBw4ZUSLz7LgX511kvC2gUCTfBYGZVjsQcE6WYnhXC1BgefL77rn ugV7ueLHqhILeTgH+dk7CtgjFrtoqwJ2EhDCBGXTLAtJaqhHwRJQNiUYPXeuhZA2HgQlxRIpd 6vkqoy6+4Pt61T323v5tkBCm8SlYnCJpdSvWO8ivxODlCP68RinhdDn108cLHNxpnSFB2T9Ac +r806x5rLP+ld0wqNIUcqBj7If0vQKIUlD182+084teSYivQI0DWa27G2VvM9Fa91XVQp/L9/ K6KtZXTnBXDek5ZjDj0UFNqsnMliDNNLEw8Wlg6hGo+YFOWqYQfWTtj6x3olUhb92fVSlB2gR Njq0eWwtkDIUxW0P774ZQGMjohXqEP0BYf3nCcDotfyAdIfi1wgTI9I5V0ZusAzED4oivvfKW aIXp2VVX+8+6MawXvDcXuo4OaA0K2EXsMyTVndQBMuC/QIp9774XazP3HVq82VZ4tt/KQ5F35 Js8qbrcQaMzGpBwpubw3CPn3jMPFztPjScnnJK9dSAMCTcsz6M= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Markus Elfring Date: Sat, 5 Aug 2017 22:10:41 +0200 Omit extra messages 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/iphase.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 472762f70921..ad4c1b41ba98 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c @@ -1623,11 +1623,8 @@ static int rx_init(struct atm_dev *dev) iadev->rx_free_desc_qhead = NULL; iadev->rx_open = kzalloc(4 * iadev->num_vc, GFP_KERNEL); - if (!iadev->rx_open) { - printk(KERN_ERR DEV_LABEL "itf %d couldn't get free page\n", - dev->number); + if (!iadev->rx_open) goto err_free_dle; - } iadev->rxing = 1; iadev->rx_pkt_cnt = 0; @@ -1982,19 +1979,17 @@ static int tx_init(struct atm_dev *dev) iadev->tx_buf = kmalloc_array(iadev->num_tx_desc, sizeof(*iadev->tx_buf), GFP_KERNEL); - if (!iadev->tx_buf) { - printk(KERN_ERR DEV_LABEL " couldn't get mem\n"); - goto err_free_dle; - } + if (!iadev->tx_buf) + goto err_free_dle; + for (i= 0; i< iadev->num_tx_desc; i++) { struct cpcs_trailer *cpcs; cpcs = kmalloc(sizeof(*cpcs), GFP_KERNEL|GFP_DMA); - if(!cpcs) { - printk(KERN_ERR DEV_LABEL " couldn't get freepage\n"); - goto err_free_tx_bufs; - } + if (!cpcs) + goto err_free_tx_bufs; + iadev->tx_buf[i].cpcs = cpcs; iadev->tx_buf[i].dma_addr = dma_map_single(&iadev->pci->dev, cpcs, @@ -2004,10 +1999,8 @@ static int tx_init(struct atm_dev *dev) iadev->desc_tbl = kmalloc_array(iadev->num_tx_desc, sizeof(*iadev->desc_tbl), GFP_KERNEL); - if (!iadev->desc_tbl) { - printk(KERN_ERR DEV_LABEL " couldn't get mem\n"); + if (!iadev->desc_tbl) goto err_free_all_tx_bufs; - } /* Communication Queues base address */ i = TX_COMP_Q * iadev->memSize; @@ -2134,10 +2127,9 @@ static int tx_init(struct atm_dev *dev) iadev->testTable = kmalloc_array(iadev->num_vc, sizeof(*iadev->testTable), GFP_KERNEL); - if (!iadev->testTable) { - printk("Get freepage failed\n"); - goto err_free_desc_tbl; - } + if (!iadev->testTable) + goto err_free_desc_tbl; + for(i=0; inum_vc; i++) { memset((caddr_t)vc, 0, sizeof(*vc));