From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965466AbdEOOEJ (ORCPT ); Mon, 15 May 2017 10:04:09 -0400 Received: from mout.web.de ([212.227.15.14]:56062 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965150AbdEOOEH (ORCPT ); Mon, 15 May 2017 10:04:07 -0400 Subject: [PATCH 2/2] pcmcia: Delete an error message for a failed memory allocation in two functions From: SF Markus Elfring To: linux-pcmcia@lists.infradead.org Cc: LKML , kernel-janitors@vger.kernel.org, Wolfram Sang References: <0d48eee5-11d8-e44e-8c11-6370ae7a7ea1@users.sourceforge.net> Message-ID: <735d7330-c00d-618f-54c2-ddf54f3e06cc@users.sourceforge.net> Date: Mon, 15 May 2017 16:03:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <0d48eee5-11d8-e44e-8c11-6370ae7a7ea1@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:Ej9Yz9M13fIPnXy9+a4TA2pQV5d0xlKLg3LcaZebC2j9z/c/Dnk xmJEu8GyGfc6hJEAMj0o4lSK6EmikI89GuIw9AcB9c5uuKxd1GJogVIbpHC894Rc8hPR/ey gg5i56Q1QIpTAvjREKtU1vROVh52AoUvHXgDAUx3n9pINLGi3fMSmLM8xqTY1Axfz/4fc7Y YkDWWTlQI1Y/yExcoYP1A== X-UI-Out-Filterresults: notjunk:1;V01:K0:PB5jQRUP/So=:zfLtBgHGIVrhVYUQdgCYAb 27hOIQMgwmN9XyC8wuiTEOvQjXsFQiVepvQkuhwFjlufHZLsGaatYmEgmMP1abmn7To4EMmDz 0hHeIEEB70OaDVtcQwgFjaiUSHWl47XhkTmXZHO+eH5Uz3ZOIXad7+I4IiKUeIpLiYo5T7fMM KnRoljsXaHu7Gnu9mNqK/v3KJnieUg71a0I3tsWbJW7ZXJnNnN3aQoAckkoIrHQQutf+3+KrS rYoG9WiI0JyVfIH5n5XcJJjEhDXLviK/kzEGo3lIyY2WDEILgXOJJwihZCZ780xc/f+KI/H8J bW3YScOlxm5GG9+jqjbYYfqBPUUJnBbvIm8KukhxhMaciFCvogPDWAwQnfDPQeTQRpsFYQKML BKTnMZKmbv9oQAAjJXAWpQHIv2fTaR5G7rbXCmATAaMU60odIwj+EP7mzkkTYYvSFqcOY1CWU JFPFzjasZLC9CwNPfAQKotZ2z25vhApNxnA4DnwiiPYpjiXOJLYPVGSkrSJHhioUZ7ftNfseW 7g5QqmXDUTQhz6gJQzTFFWAwz5AkkAfAUvJFtsfGodMcbTMqkrImVl3SGqOL7PXiiHf9IPcIO gos1tuz66HC7KcK0/unGym34naEhtXfLkvTW275u4uigdGfr0nCIV42wC6FLZ/RZlpi8JYwQg dMO280EBPpg5pxxqjAj3E5isbTtEQR3RCg8ZXIDLbBawn6LdPy0waOHHi8hfuOcg8JonZtrXW R+KiXNiZbbgJNXbEuZKqwlsTdLyjMhqV+ekSEnSrVZvyRZ0ki8ErcrviCQoWTBT4fZkl2SBCF wFR0uNM Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 15 May 2017 15:23:42 +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/pcmcia/rsrc_nonstatic.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 2e03dd8f1157..7b5bc6f6f496 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -124,7 +124,6 @@ static int add_interval(struct resource_map *map, u_long base, u_long num) - if (!q) { - printk(KERN_WARNING "out of memory to update resources\n"); + if (!q) return -ENOMEM; - } + q->base = base; q->num = num; q->next = p->next; p->next = q; return 0; @@ -162,7 +161,6 @@ static int sub_interval(struct resource_map *map, u_long base, u_long num) - if (!p) { - printk(KERN_WARNING "out of memory to update resources\n"); + if (!p) return -ENOMEM; - } + p->base = base+num; p->num = q->base+q->num - p->base; q->num = base - q->base; -- 2.13.0