From patchwork Sun Nov 4 13:57:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10666877 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 6A919109C for ; Sun, 4 Nov 2018 13:58:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57FEE28A4B for ; Sun, 4 Nov 2018 13:58:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A5CD29755; Sun, 4 Nov 2018 13:58:14 +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 E1FB528A4B for ; Sun, 4 Nov 2018 13:58:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731832AbeKDXNS (ORCPT ); Sun, 4 Nov 2018 18:13:18 -0500 Received: from mout.gmx.net ([212.227.17.22]:53737 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729507AbeKDXNR (ORCPT ); Sun, 4 Nov 2018 18:13:17 -0500 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0M1jKo-1fPXWs1yeo-00tgbe; Sun, 04 Nov 2018 14:58:01 +0100 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0M1jKo-1fPXWs1yeo-00tgbe; Sun, 04 Nov 2018 14:58:01 +0100 From: Chengguang Xu To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: QLogic-Storage-Upstream@qlogic.com, linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH 1/2] scsi: qla4xxx: remove unnecessary condition check for dma_pool_destroy() Date: Sun, 4 Nov 2018 21:57:49 +0800 Message-Id: <20181104135750.19779-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 X-Provags-ID: V03:K1:1iU2yiqlEkuPKkVJXksagyDaGxVCfXMGoQ2jJ4cHPvGwotbDhLI wGb3WC5r+qCn1rMFo4qnwxbi7tO2uKwABTCEqCkyn4aVRsuW4x6T1G54rJs1eJeoOAuViOl MAAMHwqXqnpPokNfLWmuDYSNa78AKnN7RmcBUftQ5YpoikezwI1t15s6dKguKrRc6Ji6gYx 7pNcN1g/T/dk9eQqW1yOw== X-UI-Out-Filterresults: notjunk:1;V01:K0:0FoybBd27xg=:wyNTj1ku5kNyTmzeVbhIbF 2Uko0Vyg6hSho+Oh/25SfGjRkdOnQSp7OCk8vubUe2TUxad8956ItvxvULoux6cBzfcSgHrGJ gfG08oMLPVg+WQ8T++I/LjbHOQ+A6beXeA2Vg8hknumPb4/SvVjCW0JO04k1YIp1aGRZu4tH/ gH7jquTs/MTevzrWUoT20hdDg31u/g41eYEVYjixG7uyMCXh7rK3RGsTtOMrvV+IrBQSZYMDk GvfJNmUJDjtWLTAoj7lEgtbRLLmP11SYT/rJR1BhLjRA9CCXfb2wM5KoVykOcRu+utDCXHGnM wcsVHhKJEDKy5uqa1jchT+5/PdknRhtJ9v9Vchiu+bLbS9Ytj1E8KsPGiOO5YQjqNr0eXA1O/ X3mFinocqqEQa0lRb0AfLzDBFMbC1SjLs3lC65RcgAyQlX6aeANvKAp9xLB5ithVTyhngs92N m8H6fp7TJbVVWAsBJDNEem4VTFKq3howZfxowErXqOFTW6aFLV2ZwA6qTlORaY4AuUaLeqfyo sULgs74FF7miEzWVCSl+bzuwU8bfBeokaZspaa973FwjLOxr9I7go6998LI0RmE3Z6DNSEAAV bCO05jQe6y02vJqoeWYACO407PGZhh+JEXYuAw3RAjKYqcS4LN73/GnUM+TNP8lDojtUwOjmN 8d9OTNTLUG9dc/IlBDJ8fzyWXJBlTsheoHIOkiY9qqCgdfvi6dpDOE5qmGi+KPZD7iELSpop5 uNXJ8T5ew/YY1jaYHTWyqUuNKD/B0Z34V4SW3/TjYz/+oMUThJqjIvTAN/hqNjMfVnJu3p54M EvTmL45vj8sF/v8UPuPGMzbn99njg== 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 Acked-by: Manish Rangankar --- drivers/scsi/qla4xxx/ql4_os.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 051164f755a4..039950ab1cbc 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -4165,15 +4165,13 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha) ha->srb_mempool = NULL; - if (ha->chap_dma_pool) - dma_pool_destroy(ha->chap_dma_pool); + dma_pool_destroy(ha->chap_dma_pool); if (ha->chap_list) vfree(ha->chap_list); ha->chap_list = NULL; - if (ha->fw_ddb_dma_pool) - dma_pool_destroy(ha->fw_ddb_dma_pool); + dma_pool_destroy(ha->fw_ddb_dma_pool); /* release io space registers */ if (is_qla8022(ha)) { From patchwork Sun Nov 4 13:57:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10666879 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 6E96B13BF for ; Sun, 4 Nov 2018 13:58:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DBD428A4B for ; Sun, 4 Nov 2018 13:58:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 502B529755; Sun, 4 Nov 2018 13:58:17 +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 F2FD428A4B for ; Sun, 4 Nov 2018 13:58:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729851AbeKDXNV (ORCPT ); Sun, 4 Nov 2018 18:13:21 -0500 Received: from mout.gmx.net ([212.227.17.22]:45759 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729840AbeKDXNV (ORCPT ); Sun, 4 Nov 2018 18:13:21 -0500 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0Lkjuq-1fisAR2tym-00aW7k; Sun, 04 Nov 2018 14:58:04 +0100 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0Lkjuq-1fisAR2tym-00aW7k; Sun, 04 Nov 2018 14:58:04 +0100 From: Chengguang Xu To: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: QLogic-Storage-Upstream@qlogic.com, linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH 2/2] scsi: qla4xxx: remvoe unnecessary condition check for mempool_destroy() Date: Sun, 4 Nov 2018 21:57:50 +0800 Message-Id: <20181104135750.19779-2-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181104135750.19779-1-cgxu519@gmx.com> References: <20181104135750.19779-1-cgxu519@gmx.com> X-Provags-ID: V03:K1:VIYTBSL0ZZHpaj1b9EtNYteWAC63AUMZv2S4YBhil9ZjNEs1MJP SCmx/JvkNP7Se4tZHKc/lwfNZbLGchWemQmQmxCzUslVOyVLD8+pUuEz9WTs+/UR/pDkTeG QIFiSO4oSMasGgRBQO+ntUNWLdyb8IegUoFzZ9+nNIq2XK2PMddm9MfjGFl3WoYzl+YiFo7 oc1cTkke/tSnE+604A1jg== X-UI-Out-Filterresults: notjunk:1;V01:K0:+KpNrJOf1l0=:MZ+ViuWyhFHqcQ7wImHUcI djjwtnEklUiU6R6GmGgKKXeJ8pMDgMvx6dKjdoQ7NxvdmGjFJs2pOxwERDoGoMsbiYPSfmos1 5rKcTIrG4jZx8k1oF92ezoBMj9oR05lg5xESoRVmPDEGrxIktuv09qW+nI+81Xhlg8V7fRnGm WnsG6bXbMMl+rhDBsRas/0NZqi38U+GfmMiDmUrIERVrRkKtRnjx7pdut+3woSq13By+9x29l hUWchsGnNGSBG/yHCN7V3Jj8vkU1d1Rz5P91Z1ZKoCiLTDTphB0vwMW3dVpUUvOnNVfVk1L/T onrkTka4RSFAmKA440qSLjHPGFf6q5PP6pdeg1WoXdIpATQ4IgEmu4IwfPZ8KlLGWQCnEuZ4C lWy9Vt4bgLLUp+hVrEimUGfLA36FSVi/6J83XpPlqQU7zZlo/lydTDdMOXhxC3SODG0ji3+Gm BTH1BNWcJ5cXEwbgc3NpBMJCIG8Y2fi8LFIrBJErP+68FVkjw/KtKfHD/gMQIQG1AfGizmSEM zpYF5jgdybrhRTt7OD1VPP5aYBr5pzUDA2Q9IW/tXDEzwSf5AMbNHoD/2U4oQFbKFB8EkcX66 TwF1w0fgB4fjV6+Cn3Jk0g1b8lZsNeCYOGnXzpIsYVrkZbs1bGBkFXjK6Qu7m5vC7nQv9XWfS M0lgzx8r75zKp++FsSt3wKN8tyoAsedznddsHR9cJrDhzH8jfFY4msUyPDK4E+t0LlyNUFTIs LpAPd3YeIfahYZYN4kVB8wOAhHnG5KN/0+azYsw2O0KQxfe17mw1wxAgScmfoo+Dc1/0dvNd9 SZLFso6iPekWR0tl70t/TgZ9qBT7A== 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 Acked-by: Manish Rangankar --- drivers/scsi/qla4xxx/ql4_os.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 039950ab1cbc..1c702cd22359 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -4160,9 +4160,7 @@ static void qla4xxx_mem_free(struct scsi_qla_host *ha) ha->fw_dump_size = 0; /* Free srb pool. */ - if (ha->srb_mempool) - mempool_destroy(ha->srb_mempool); - + mempool_destroy(ha->srb_mempool); ha->srb_mempool = NULL; dma_pool_destroy(ha->chap_dma_pool);