Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1704752

[PATCH 2/3] ATM-iphase: Delete five error messages for a failed memory allocation

Path csiph.com!news.redatomik.org!aioe.org!bofh.it!news.nic.it!robomod
From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 2/3] ATM-iphase: Delete five error messages for a failed memory allocation
Date Sun, 06 Aug 2017 08:30:02 +0200
Message-ID <ubney-76u-7@gated-at.bofh.it> (permalink)
References <ubnex-76u-5@gated-at.bofh.it>
User-Agent Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1
MIME-Version 1.0
Content-Type text/plain; charset=utf-8
Content-Language en-GB
Content-Transfer-Encoding 7bit
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 robomod@news.nic.it
List-ID <linux-kernel.vger.kernel.org>
X-Mailing-List linux-kernel@vger.kernel.org
Approved robomod@news.nic.it
Lines 84
Organization linux.* mail to news gateway
X-Original-Cc LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
X-Original-Date Sun, 6 Aug 2017 08:28:19 +0200
X-Original-Message-ID <ddae6055-5d63-17bf-4bce-0cfa346b3515@users.sourceforge.net>
X-Original-References <c30df8dd-a6e9-23c1-842b-afa8696e10d4@users.sourceforge.net>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1704752

Show key headers only | View raw


From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
 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; i<iadev->num_vc; i++)  
 	{  
 		memset((caddr_t)vc, 0, sizeof(*vc));  
-- 
2.13.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread


Thread

[PATCH 2/3] ATM-iphase: Delete five error messages for a failed  memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-06 08:30 +0200

csiph-web