From patchwork Sun Nov 4 13:44:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10666871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 12C2313A4 for ; Sun, 4 Nov 2018 13:44:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F077B297F4 for ; Sun, 4 Nov 2018 13:44:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E482B297F9; Sun, 4 Nov 2018 13:44:39 +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=-7.2 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SUBJ_OBFU_PUNCT_FEW 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 9A586297F4 for ; Sun, 4 Nov 2018 13:44:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729508AbeKDW7k (ORCPT ); Sun, 4 Nov 2018 17:59:40 -0500 Received: from mout.gmx.net ([212.227.17.22]:56681 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729479AbeKDW7k (ORCPT ); Sun, 4 Nov 2018 17:59:40 -0500 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0M6730-1fL8Yy3xne-00y6HE; Sun, 04 Nov 2018 14:44:27 +0100 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0M6730-1fL8Yy3xne-00y6HE; Sun, 04 Nov 2018 14:44:27 +0100 From: Chengguang Xu To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: qla2xxx-upstream@qlogic.com, linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH 1/2] scsi: qla2xxx: remove unnecessary condition check for dma_pool_destroy() Date: Sun, 4 Nov 2018 21:44:08 +0800 Message-Id: <20181104134409.26467-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 X-Provags-ID: V03:K1:mBLgxJU6pswWF9L0Su3AdJm5vAsAQu8hZPVmlCMyE8gztd4S9uD 2avT2KRm9rpv3P26/oQfxIButE5zK3spItrv7la22Hhei1rI/5HWPtptVMj70Oi/0U0IGnJ pllLwOI12IfuX4brk4C2dYGEWFaVmvy6DE+sBN+XTZjQlWdWkrrYV+rZnfTWQR9gl6H7yam 7WfwiQ38ouaocmehWWkFg== X-UI-Out-Filterresults: notjunk:1;V01:K0:afNCNyGaIo4=:+/4toctUqi3IidHiawGvrT fBtHU+6l2h9HW3JZgMn6qKP3s+ZZW0MQYeYAizI3/SYFyNo5x6gXrFFNQw2Gh0crC9aUFVSra HKzdssNXuZnJ2Mjj0QffCCHMgkg73s5n3VTs7ZEPPHSCffDbDPNukpEgX1v9X8qpKLiWp1Pwv 9EpRTw8xFLWq0Hi+NvdquT/HKtowq8He4eu2pqI+GqSKJmh+hRk4bc8/YmS9FjdWqAYzzctb0 bwiDHcOUxQZgFp06cK65+nPdf9jLWLttMiqkPOb63sCO4FF+X6Uh0P24Gn/UMMpSEUiXxczCR v0zKSeoui5HLOtMmieiAtqecH+D+erMzIQT7WJrRV/ry8pZUeRP87BccKXaRJNjbu/wWHhLMv 0RWYb+C920wAZ8WPcBSUU3DuMMZPkJbp/MJg2f1cKTR4ple6nGc+PJDPFvGSnLowv1phuINg0 W69uVoSZ0nKZn66emD9EZ+qRTncjbmNgzNkaTcSuTECE0GQwvYMV72bQYQ2/08VzKLA0UnA1e 0TuMeXjkfzrtgbwKr8CN6ldmI362qiaZE7XJ6rDS6uUdrTk6m2OWxNfk3HxfJXw29u8o8ksex gU/XfvFb92ERvLdmpxVX2VQvgAKK9AUbyAjwJS0pC5ilPVrCQk/aRqA3tiSpHGFEUtpnaeDN7 QFoWe2QwkAaMF5W4D0SWTulSTNvikQL8hcrvKJGFU5Ns1Mv3pMTGWPq0wNoEg2qpTfvZyctVm kiRFmgEEm29fBkciH6bnzQGIUINN9VG7sX/d0zogSOWpFCnQFskqcNxOEQI8ceKQL3wNz1is4 YabCxprM4Ct4d78zAm8/xRCQet9PQ== 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 dma_pool_destroy() can handle NULL pointer correctly, so there is no need to check NULL pointer before calling dma_pool_destroy(). Signed-off-by: Chengguang Xu --- drivers/scsi/qla2xxx/qla_os.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 8794e54f43a9..d3dfd273e217 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4525,8 +4525,7 @@ qla2x00_mem_free(struct qla_hw_data *ha) if (ha->async_pd) dma_pool_free(ha->s_dma_pool, ha->async_pd, ha->async_pd_dma); - if (ha->s_dma_pool) - dma_pool_destroy(ha->s_dma_pool); + dma_pool_destroy(ha->s_dma_pool); if (ha->gid_list) dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha), @@ -4547,11 +4546,9 @@ qla2x00_mem_free(struct qla_hw_data *ha) } } - if (ha->dl_dma_pool) - dma_pool_destroy(ha->dl_dma_pool); + dma_pool_destroy(ha->dl_dma_pool); - if (ha->fcp_cmnd_dma_pool) - dma_pool_destroy(ha->fcp_cmnd_dma_pool); + dma_pool_destroy(ha->fcp_cmnd_dma_pool); if (ha->ctx_mempool) mempool_destroy(ha->ctx_mempool); From patchwork Sun Nov 4 13:44:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10666873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 12A0A17D4 for ; Sun, 4 Nov 2018 13:44:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03618297F4 for ; Sun, 4 Nov 2018 13:44:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBDB0297F9; Sun, 4 Nov 2018 13:44:45 +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=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,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 DC9A9297F4 for ; Sun, 4 Nov 2018 13:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729524AbeKDW7q (ORCPT ); Sun, 4 Nov 2018 17:59:46 -0500 Received: from mout.gmx.net ([212.227.17.20]:55041 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729479AbeKDW7q (ORCPT ); Sun, 4 Nov 2018 17:59:46 -0500 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0LsxuQ-1fYJqH1hPu-012W7Y; Sun, 04 Nov 2018 14:44:32 +0100 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0LsxuQ-1fYJqH1hPu-012W7Y; Sun, 04 Nov 2018 14:44:32 +0100 From: Chengguang Xu To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: qla2xxx-upstream@qlogic.com, linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH 2/2] scsi: qla2xxx: remvoe unnecessary condition check for mempool_destroy() Date: Sun, 4 Nov 2018 21:44:09 +0800 Message-Id: <20181104134409.26467-2-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181104134409.26467-1-cgxu519@gmx.com> References: <20181104134409.26467-1-cgxu519@gmx.com> X-Provags-ID: V03:K1:AO3S8BDvyu8z1YxE8R47+97V8XICuPVjY7b+/0/x4Q80pJbR1Nq 7yRp+rbJU5Whmfvt2gCn7pc25EdECOyAf53IShTlgozloVv2sQIDUhHWDJGup/iBYv6kpfB 72EdGt32IKVH9e/cVZu4d+yyy4innVLxfcXPmn39aEpG/7ZljGj/vOx/sKHQ5ZyDJaq3gLr VIBOxzhAZJI9LrCBQnNcw== X-UI-Out-Filterresults: notjunk:1;V01:K0:5RuAU9GsPso=:EvR0SZaj5tB7cgbQxN5JN9 k4eCFn/7QdLRyuze6r28rFynBgmR+NuieKXGTlT30Aha3pCP7wjtspuQm9NMKTFU0Gss10atA whBWoAz0b1TCmS2IPyePcXFPznpKlvm+wW7X1vMT2eq6wFRtIFqlTcVghfWH6NJ6XRTYntRDe 54DuZ6zFXhW4v6E1x/+UaemIqKObjfH3mlqCKH8EKFf5W2QoSTk8KKjJ+uSC4QW3oQSTnz4vS Q73Grses6v6mBRr8oqw/qEDR91585s57Pn4EcaUMznR1Sp8xeJhpWLxafLnRyJ/CX1Er3FK99 QHPs5WXqE6ht6hQgkXgrRyXUZ2cCeu5XzJBPo5/X58kCIgr8Ai7fxNSKCMiekWnOms93cQyEN GtIIqMfpOjTzvrdCAWqWwHya1ttmtss9pZuxCz2IRzsQgmVW7/L+XCF9wBYuepyIfnxIP5MKm aAtL1H/m6S65xm/PMnnwYHeDFhb7dojDyfV7tvGaJxAn19PHnoV1iNAEaps8FM6JCN8VHQ+tw pPb4W7VbONEhkJnyQGUiVF6du0qHjN9OQG1lBlKdkiuTWTEwS+bgEGDc8WOt6m8LjXaEpgAdr kMUsSME+zCM6mwuwKA/MbDkZcFCWhbKloJ9+wpY4yGcGHGZK3e8oZzFKp7iU19TKYZLFe26rG 4xH+JbWXwXCClr9djSrK8ISok23arOoZd8hnP7i1XqnDHITEsuk7TTlqmBkRtvHs6Q1wadAmI vTNVMRmz12DLP3R3rjzl45bJiR8EGaoYvyCSXsdMeuAxNuatnogUjfUgFS3fy3yK1nak5SHGK bgIqVhNBWzYb18QW/lNxvmh2vCCHQPNEtFeaAyk+3s//+DgTHWttl73W1nhJu7jHlrBMfQ+d2 XKnFcnr/k80RF0KMk20iqBYrIS1MZR784LHgZY8gk= 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 mempool_destroy() can handle NULL pointer correctly, so there is no need to check NULL pointer before calling mempool_destroy(). Signed-off-by: Chengguang Xu --- drivers/scsi/qla2xxx/qla_os.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index d3dfd273e217..c750033e52b9 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4185,12 +4185,10 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len, kfree(ha->nvram); ha->nvram = NULL; fail_free_ctx_mempool: - if (ha->ctx_mempool) - mempool_destroy(ha->ctx_mempool); + mempool_destroy(ha->ctx_mempool); ha->ctx_mempool = NULL; fail_free_srb_mempool: - if (ha->srb_mempool) - mempool_destroy(ha->srb_mempool); + mempool_destroy(ha->srb_mempool); ha->srb_mempool = NULL; fail_free_gid_list: dma_free_coherent(&ha->pdev->dev, qla2x00_gid_list_size(ha), @@ -4492,8 +4490,7 @@ qla2x00_mem_free(struct qla_hw_data *ha) dma_free_coherent(&ha->pdev->dev, MCTP_DUMP_SIZE, ha->mctp_dump, ha->mctp_dump_dma); - if (ha->srb_mempool) - mempool_destroy(ha->srb_mempool); + mempool_destroy(ha->srb_mempool); if (ha->dcbx_tlv) dma_free_coherent(&ha->pdev->dev, DCBX_TLV_DATA_SIZE, @@ -4550,8 +4547,7 @@ qla2x00_mem_free(struct qla_hw_data *ha) dma_pool_destroy(ha->fcp_cmnd_dma_pool); - if (ha->ctx_mempool) - mempool_destroy(ha->ctx_mempool); + mempool_destroy(ha->ctx_mempool); qlt_mem_free(ha);