From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966224AbcIYLMg (ORCPT ); Sun, 25 Sep 2016 07:12:36 -0400 Received: from mout.web.de ([212.227.15.3]:49746 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938386AbcIYLMd (ORCPT ); Sun, 25 Sep 2016 07:12:33 -0400 Subject: [PATCH 2/5] ISDN-CAPI: Delete error messages for a failed memory allocation in four functions To: netdev@vger.kernel.org, Karsten Keil References: Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Wolfram Sang From: SF Markus Elfring Message-ID: <3baf0b5c-4687-0ac7-6bf5-5cf7129e3c03@users.sourceforge.net> Date: Sun, 25 Sep 2016 13:12:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:pV98kWFOPeQ1joR/yeNIUpHSHwdEYgK+SvQyZSQDeP0gNsd3dcz pJvBYdvkT269KVGz3YJW8/0c1TmKde2CqqCjD+wok9Bb+ui+EKV1++lWs6C8sKM7S86WGGN NRhmu+wj1Wg2WJXovH/gSiGhk3zLAJl1tiWWxU7LpBKyHuFrZJb44gu6wp9gUxKOKCOKjZ+ hFl0R+bufz6KwvhxAp1Zw== X-UI-Out-Filterresults: notjunk:1;V01:K0:19b3qiPB8Ks=:eJI+KmwAqrz/DS9mQSqfnr GRpgqxE24ZPCv3RGEKHpQf1H+moj5w4pcJJMFoLmk3SPmVixhD+/4ZsppsbGl7R2gQjHyHDRz jMszfFcDDKWFgvo43Vdle6xFJd5NEBwJLhXI/BGIQ2LlKgYRI8bwMHHUC4xuU24d2RUnQtALB SguVeYx4yl3wXWN4a0If8tpm2EYM5OVbxy5p8M7DJAe5Ov77yIyvEP6VCvSkH/kf1wHFIWy1f UXeRA3qpsB/jlrBMuRT26ot0kTMlLx8+Vy195wOr+xBnPAwqoK/bCaD/Nh+4oSUPLH+YRxyBl QNMLxcL8Y6ffOg73gocBBL13TQRFd+sLkp440+nafiGGcAyd3pEtlZcc8l27aUS7TECBC6cTc 1EA4ybZQXhvGVfhpx7bTlSOO5wT8TAbt6nSPmk52mE3gYunaiFWMLq7EQ+w2IlSqJ4GtCuo14 5ZEYfn3bR13A7J81bLQIrwlUvsKwiIui7p94RtAkDp1aY4jbxycey7w63LLBUdMigUcJWKoAo oxg1QO+sOcNer1ZPqJFGohDSYDj6Z/kJocawhtqN4SlDlHOgxWwwSG3/VwObJ93xlTFjxNwDp 0Drl633mAJx/alb/BwfeqFfB7pN6rQBlNjGPrTeI0MNYArH4oFQJTRwqnlCTcu7sXa8ghoYGX KJdJHWCIwxQQWQPhzDTsyg2Ud8h430z6Ydxvg6JUHt53CZstAz2adOpN5R8ubaSyNRWmo4ZhF ih3z2JgrJ14Q4x35LW2y+1thkC+sEptBh/tO+KX4kFFEVa9eMFqVrr1m71Yjgjbpqm5i2JSww xgUiKqq Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 25 Sep 2016 11:17:39 +0200 Omit an extra message for a memory allocation failure in a few functions. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- drivers/isdn/capi/capidrv.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index cd8e1a6..bb945dd 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c @@ -471,7 +471,6 @@ static int capidrv_add_ack(struct capidrv_ncci *nccip, n = kmalloc(sizeof(struct ncci_datahandle_queue), GFP_ATOMIC); if (!n) { - printk(KERN_ERR "capidrv: kmalloc ncci_datahandle failed\n"); return -1; } n->next = NULL; @@ -513,7 +512,6 @@ static void send_message(capidrv_contr *card, _cmsg *cmsg) len = CAPIMSG_LEN(cmsg->buf); skb = alloc_skb(len, GFP_ATOMIC); if (!skb) { - printk(KERN_ERR "capidrv::send_message: can't allocate mem\n"); return; } memcpy(skb_put(skb, len), cmsg->buf, len); @@ -2111,8 +2109,6 @@ static int if_sendbuf(int id, int channel, int doack, struct sk_buff *skb) if (skb_headroom(skb) < msglen) { struct sk_buff *nskb = skb_realloc_headroom(skb, msglen); if (!nskb) { - printk(KERN_ERR "capidrv-%d: if_sendbuf: no memory\n", - card->contrnr); (void)capidrv_del_ack(nccip, datahandle); return 0; } @@ -2259,8 +2255,6 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp) return -1; } if (!(card = kzalloc(sizeof(capidrv_contr), GFP_ATOMIC))) { - printk(KERN_WARNING - "capidrv: (%s) Could not allocate contr-struct.\n", id); return -1; } card->owner = THIS_MODULE; @@ -2272,8 +2266,6 @@ static int capidrv_addcontr(u16 contr, struct capi_profile *profp) sizeof(capidrv_bchan), GFP_ATOMIC); if (!card->bchans) { - printk(KERN_WARNING - "capidrv: (%s) Could not allocate bchan-structs.\n", id); module_put(card->owner); kfree(card); return -1; -- 2.10.0