From patchwork Fri Aug 25 19:00:43 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: 9922673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F33B6022E for ; Fri, 25 Aug 2017 19:00:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7ED0C28464 for ; Fri, 25 Aug 2017 19:00:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73A52284AA; Fri, 25 Aug 2017 19:00:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 252CE28464 for ; Fri, 25 Aug 2017 19:00:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758093AbdHYTAx (ORCPT ); Fri, 25 Aug 2017 15:00:53 -0400 Received: from mout.web.de ([212.227.15.4]:59936 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754749AbdHYTAw (ORCPT ); Fri, 25 Aug 2017 15:00:52 -0400 Received: from [192.168.1.2] ([78.48.209.8]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LnEs9-1dKE9h0oBh-00hO5O; Fri, 25 Aug 2017 21:00:44 +0200 To: linux-scsi@vger.kernel.org, "James E. J. Bottomley" , "Martin K. Petersen" Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] SCSI-devinfo: Delete an error message for a failed memory allocation in scsi_dev_info_list_add_keyed() Message-ID: <5496530a-d25e-37be-04be-8c1419cf48f6@users.sourceforge.net> Date: Fri, 25 Aug 2017 21:00:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:6MGiGmKVsmRv0+Ri+hlD5G8OpQWhbgIac02N2BQHwZVtp2jDhj/ qWQCea9VR1ZKG1sCNGuSNFeLaP067kkrr+51GHSsKy5n6sn7gEwGpnQa7ytgNw5kob1g6UE 2KJtyARTniJ296cRc6gABEZAQkFj3Rh145QDowPfH19hHYLxf4Z53gMi5xHinX0p8yyaK1U MxFSfVM7VcahysbblzxKA== X-UI-Out-Filterresults: notjunk:1; V01:K0:dxkYIrLQU+c=:KFJA4qJkliA6pVnm7JSliW pwvotagu+871Hfg75Vdh8HnfGM0JL/bhtNRLEZw2EePKCrvB1Md4c4vvT+BaPuq/HueBCJgce RS9JjTDTG6MbRZdLEvH5//flEEZ6taVGVSoyEMZm1siNpB22IPCJ/7ODjbejo8hVAu1mMDzY6 qMhQPl4/Cw6mU2IoOmJBLKDNIh5O1vN560gDTeHR6hAE6t5jjPJysXIlaVBUqJbcUba61QeCT 4UmOESoYevMUm7dItEDwKJ6Iw8VQkZoeX4hAUJemDLp59EOlVFSG7Cl2ycfJN4pKjE+qTAdoO T4RMTZ+LHe0xnmf7F4XzDNXxfTQ+JNyLIZUbvmC9aOnQ7io83aTZEYTDmqJFQCOLiJPh50BkK +vLrDrw0F0xVWUkapSsze3/MB9lXjbn/umTU2brNoLBGIxgn6sHyqTzsQ6Nl99C2mVitiriug 1JOZwChQw2g+jiJ9A0TmwBkYEomkJqpRBNshbwWfeEZGzpKhXoCb6Zie4LtGcIrcXnWv7utBL DTr+oeyiP7Euo98Ge/CWT3Xt6dTKccgIEaRcXdRTtYSGQDXKbyKKR5r3TfEOa13X1e0Hmvlsv NxOi2gyLXWYTQrFTg3LXb6ThoUD8rA4LWkaHrHasITsgATg5sbkhTa0YOa1kiP9evosRk7XO3 wT7eeKVALJ7ppc2E/jDtTP2xAEQik0TQNMyIsKHRZta8PDSM7Uzgn2bQypZccKVsTSwWdrMpP PY+j18f0ItBIYA3Pq8t/ZDjcf+SdkM5hOk4Q5qzqLdIoSPpCQz5OxgGYW8XEXeP+vlH99fs6k ezoa8zyKh/i+qXDb74QcW2XiKKuCzfhVVP01gpDXDI0xM1WlJA= Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Fri, 25 Aug 2017 20:54:16 +0200 Omit an extra message for a memory allocation failure in this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/scsi/scsi_devinfo.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index 28fea83ae2fe..3009934b95a7 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -369,10 +369,8 @@ int scsi_dev_info_list_add_keyed(int compatible, char *vendor, char *model, return PTR_ERR(devinfo_table); devinfo = kmalloc(sizeof(*devinfo), GFP_KERNEL); - if (!devinfo) { - printk(KERN_ERR "%s: no memory\n", __func__); + if (!devinfo) return -ENOMEM; - } scsi_strcpy_devinfo("vendor", devinfo->vendor, sizeof(devinfo->vendor), vendor, compatible);