From patchwork Fri Nov 2 14:37:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10665583 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 404D913B5 for ; Fri, 2 Nov 2018 14:37:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E51228CB5 for ; Fri, 2 Nov 2018 14:37:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1EE5C28B81; Fri, 2 Nov 2018 14:37:59 +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,SUBJ_OBFU_PUNCT_MANY 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 AF27928B81 for ; Fri, 2 Nov 2018 14:37:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727744AbeKBXpQ (ORCPT ); Fri, 2 Nov 2018 19:45:16 -0400 Received: from mout.gmx.net ([212.227.15.15]:57717 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727454AbeKBXpQ (ORCPT ); Fri, 2 Nov 2018 19:45:16 -0400 Received: from localhost.localdomain ([113.116.157.11]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0M9s2y-1gPA954356-00B4B6; Fri, 02 Nov 2018 15:37:49 +0100 Received: from localhost.localdomain ([113.116.157.11]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0M9s2y-1gPA954356-00B4B6; Fri, 02 Nov 2018 15:37:49 +0100 From: Chengguang Xu To: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, shivasharan.srikanteshwara@broadcom.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH 1/3] scsi: megaraid: remove unnecessary condition check in megaraid_mbox_teardown_dma_pools() Date: Fri, 2 Nov 2018 22:37:32 +0800 Message-Id: <20181102143734.31810-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 X-Provags-ID: V03:K1:1vOuxBwR9rdv4wBCymSBu+tw7ON4HzQp4hB48fpWAzIa9ygGzRZ 7NBfM0nyZe90JDXowOu90HJu/SIL/VWiS4jeIPY82CpwLAQ36g0CUFETbKSQ7EMlBAQFdQB P7x2cPE2MK69Asw/5ITcGeXxSFX0RTmGcXr4OpJdcWpLxFyeDcCsm1kzHA22U3tfIsOJlBV gvH3ZdJYny1oW8cQzh/AQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:ShUVTO2NDZE=:3/4lCZ0A964q+C7CZ0UPEC XxnwcASmRgsjkTFahebd4fDwcIj6yE2WMBtV4f1CCQUT/d8dOphIxlpxQbf4gshV8fFu1lDCX NycOrNdSAJuKNuPGWx98HrZSkPNDQHZfgQKs/IbW/uZbvftaJfaGyXCPFvkwr/7XvrU9TS7Mv 3G9RDou+0Py059Nt3qEWkryQc7Z7sjADmZEyB/p4OGtBQTD5q/3tQg1/0UGJbStKrqPS3xWj4 yj4wlVAmTbTzM5SQ88aDC6lJ3/UxdRBSKeGKAKzc8jFsgQalV22o17zVJlK5uayS7APjNAaAt ZXdo7frXPe9xvtrgErxeq8mPj2X4O6l5M570Z8BBIrBgQyUFEie/A6USkV2XDXKcLABOyZKxA i9ze6jNOOl1nDt+HQ+GBS2wMjncXqQT+gdNy3UE8ID3Fe113/IeRPBwJCFzVOoyXEcFV6VPtj ZEKEBrEM0kTM/UC0qDyeXWZNZviZ4np3TVRe2wphC6ZT/mFk4h2rt/FA1YjlWS8aA9GV1WU0v 7xWy7FjiedU1z6ITq6Mtv8askM9u7PsirhMJtRDSCXDg5ao0AAqGHz6GdqI3ZrHDgHTyK4wOv 4R59UHwFenpn/5gbeqb/9TP1N98W+FXdyuQqsOLx0GvfqPrmNip1ELLwGiDs4zgaSoLsjzupc P3j890UcXHcms0dogYleAZBJN+TzvUyvBFqZxpkKT6frZ+9AI3RoOweiN8Dp0FrVb5GChB8AR /K87bqLb4TZ//rcrvqD1VF0ecPHgLcJ9PHgEjVdK8kDOEi27zNjtszEAlNFVgAByMfZRTfk8C Ff+XbeemvHMBLNnQvF+UHvjMLW/ng== 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/megaraid/megaraid_mbox.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 3b7abe5ca7f5..7f9ba88d1c2d 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c @@ -1243,8 +1243,7 @@ megaraid_mbox_teardown_dma_pools(adapter_t *adapter) dma_pool_free(raid_dev->sg_pool_handle, sg_pci_blk[i].vaddr, sg_pci_blk[i].dma_addr); } - if (raid_dev->sg_pool_handle) - dma_pool_destroy(raid_dev->sg_pool_handle); + dma_pool_destroy(raid_dev->sg_pool_handle); epthru_pci_blk = raid_dev->epthru_pool; @@ -1252,8 +1251,7 @@ megaraid_mbox_teardown_dma_pools(adapter_t *adapter) dma_pool_free(raid_dev->epthru_pool_handle, epthru_pci_blk[i].vaddr, epthru_pci_blk[i].dma_addr); } - if (raid_dev->epthru_pool_handle) - dma_pool_destroy(raid_dev->epthru_pool_handle); + dma_pool_destroy(raid_dev->epthru_pool_handle); mbox_pci_blk = raid_dev->mbox_pool; @@ -1261,8 +1259,7 @@ megaraid_mbox_teardown_dma_pools(adapter_t *adapter) dma_pool_free(raid_dev->mbox_pool_handle, mbox_pci_blk[i].vaddr, mbox_pci_blk[i].dma_addr); } - if (raid_dev->mbox_pool_handle) - dma_pool_destroy(raid_dev->mbox_pool_handle); + dma_pool_destroy(raid_dev->mbox_pool_handle); return; } From patchwork Fri Nov 2 14:37:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10665585 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 3E8B0157A for ; Fri, 2 Nov 2018 14:38:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C02828B81 for ; Fri, 2 Nov 2018 14:38:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CF1728D8E; Fri, 2 Nov 2018 14:38:06 +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 0A80428B81 for ; Fri, 2 Nov 2018 14:38:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727771AbeKBXpX (ORCPT ); Fri, 2 Nov 2018 19:45:23 -0400 Received: from mout.gmx.net ([212.227.15.19]:59269 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727454AbeKBXpX (ORCPT ); Fri, 2 Nov 2018 19:45:23 -0400 Received: from localhost.localdomain ([113.116.157.11]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LnfuZ-1fcgaz1LLz-00hrtH; Fri, 02 Nov 2018 15:37:55 +0100 Received: from localhost.localdomain ([113.116.157.11]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LnfuZ-1fcgaz1LLz-00hrtH; Fri, 02 Nov 2018 15:37:55 +0100 From: Chengguang Xu To: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, shivasharan.srikanteshwara@broadcom.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH 2/3] scsi: megaraid: remove unnecessary condition check in mraid_mm_register_adp() Date: Fri, 2 Nov 2018 22:37:33 +0800 Message-Id: <20181102143734.31810-2-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181102143734.31810-1-cgxu519@gmx.com> References: <20181102143734.31810-1-cgxu519@gmx.com> X-Provags-ID: V03:K1:20R4+2gv6mb12uv+MM6E++7X9QxhU9r9BkERC0IXBSiI7tuPaTc meRnI1tueGNzmPtIijBCBf3FRXw01IFCRl4gxmtHwAQFLZd/gD2bYqEsWvfJgqMDj/fduSC 6uGP1085HwIjmS1RWuA5W33E/D10fkPpsJrDXWdb2UPbacXf7rVDds5euD8hsvhIFBAxZov 3IFkYGyNSplTE8FNX0ueA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ebgmxBAXKFc=:5HcljCQNfezqXqMqQvJjAh UncF0jG+kJDfc9hWz6uYTNY0slaOCUPIgt9NnuMc+FiXrMj3Vbu5fM3YIO8JJ/3kx+K39flJd yEpXsqb2hrAoZSgCXBxLf25GmDeoReqHdY22PHhBuDvKR4pILMt9oIOjg7TnCdt9NAl0OWh87 DzqvXa89FVFiDdeg+GMvS5Lb5/4o9X3QJFcbAxVxREjnLYmbX6jOQjPxupTq3D0dCLudMX8VU 5VOL9YXwBbmYztyhVesZrSW2c4wc6XXWBLFDMrdKgmsHFs4ckxbrImAUL9XUueqenXfmRtZp9 irlnaNO/mdx3u7FSweEcNhFmXCner7+8OOv93yHQPLXkgT+eJIxUViJ0k7q3S6hWUgD3u8tUk zB2a6ugySCBmCzJlRMZLJhTw+4gUI/G8L2P5w3O2BkVKkkQZqTWzCVC5EKedAGmSuBx3aOmC1 qkdJ06Si8yDvJ27R/fRoS73qPT8TqTBSGGR4gs8CZy+LanFBkOLHsn3SPaTH9FdYVKx8t5oel XtW4s0d/oNt9r/Ux0NplGctlLWRk3DEGNxrdRJ4Pev3NNHoZwbTdqOJrKZXDL3GeCzYlstlEF cmx3e0R9MTmd03IQR4Pwt0Z4lJ06JE8B7f9rgYAsNqudmy8Wo7bgSTZoZ/F2ZWKSv1r6P0OVL kh10HBIs8L61+HYZw7oACs2fEbqaUGv9XqFlPINBVnSsUShu0xosif/dBIM/2VxosJxfQeCpb JazenwtEzCjEIKb4NKq4wPFE4KsTE+DUgruaZSMJVN1Tg2+PEywVjt7sNPQcN6+qUvrxqFvNV IsjAnZSTzMGudzbwioTvdjjCfrizg== 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/megaraid/megaraid_mm.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index 8428247015db..ee870bba15ef 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c @@ -1016,10 +1016,7 @@ mraid_mm_register_adp(mraid_mmadp_t *lld_adp) kfree(adapter->kioc_list); kfree(adapter->mbox_list); - - if (adapter->pthru_dma_pool) - dma_pool_destroy(adapter->pthru_dma_pool); - + dma_pool_destroy(adapter->pthru_dma_pool); kfree(adapter); return rval; From patchwork Fri Nov 2 14:37:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10665587 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 A7825157A for ; Fri, 2 Nov 2018 14:38:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9826D28B81 for ; Fri, 2 Nov 2018 14:38:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C05D28D8E; Fri, 2 Nov 2018 14:38:10 +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 388B528B81 for ; Fri, 2 Nov 2018 14:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727808AbeKBXp2 (ORCPT ); Fri, 2 Nov 2018 19:45:28 -0400 Received: from mout.gmx.net ([212.227.15.18]:46721 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727454AbeKBXp2 (ORCPT ); Fri, 2 Nov 2018 19:45:28 -0400 Received: from localhost.localdomain ([113.116.157.11]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LedVG-1flB3O3GIw-00qQc2; Fri, 02 Nov 2018 15:38:01 +0100 Received: from localhost.localdomain ([113.116.157.11]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0LedVG-1flB3O3GIw-00qQc2; Fri, 02 Nov 2018 15:38:01 +0100 From: Chengguang Xu To: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, shivasharan.srikanteshwara@broadcom.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH 3/3] scsi: megaraid: remove unnecessary condition check in megasas_free_cmds_fusion() Date: Fri, 2 Nov 2018 22:37:34 +0800 Message-Id: <20181102143734.31810-3-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181102143734.31810-1-cgxu519@gmx.com> References: <20181102143734.31810-1-cgxu519@gmx.com> X-Provags-ID: V03:K1:dA6CpxXMPEqG7HNQvI+oyv7tT9f8Wq0j827nEAPUR+8p9mOiEZZ gwuKcqZA7QOOyYXlr3eCqDp69Rl8oPKc870EmGWp+WhkFaPq15/CtGYL0JiqqaDbREjYIkq CLPJhoBpmXNihQ6QLNMRbahSJpOxvPVHGUHy3ZTe+8PXkRLPyb3w98wcubPBLEh+z644KTu sVM42DCC7MCuHjdJBfSVQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:pHDRXbkS/5g=:S4rU4Qw3PYk1m56dCTw1Pu PampMMTqyVz6Zxt5hi5WPrx+yyZuxH6UEwy4Ntsu72IrC/FylvQncB+WcWpFQYFvub/Au70Ks GkfsgLMCC9xQyEstsIqFmzrTD8C/VnrkhMIcc8KGOO7ctzSTUcG4auA9LMcQl7DFy9iTudURe 6uMIyypJAtwnwX7J+LvvVNewmFNWf9LWgIlQX9/j1ldzH1CS/0AjhugaV8bBrtuzU7EN/4rzN WtgMi/CKwPSWsEnkSNewC98564imAlC0A+J9v30dt4ipjugFyiZhCrbP/ZKoK4P/FDVlRGlnQ SddlsziKlblvJQkolXzKhQnnNPc2Y/awz/4qZjLiuLyoFKMr2WvkBhL01v+CJDQLxeCjIr3KD HEcjoPDziofhRycIISBde6Pfvi/U0bcxhfuqWkeNksUF7fvGEEJgpqsjJ30XkfVaR7GAllDir 8GmsTJhE1YrgkK2ZvXvJIb9fw8ZzPxximBHqre/hmDKCBBgoUIEU0ovMZmAOFYL8A4MXsfvXi peJpE6CrhGT1qVI/BXTI+dnHr2MTE8q3wYs5JmKytgPD/oULxE4ZzarI1N/6TDSw5o47nAvZ0 Cm1vilzcpgW20J0pJw/ejmqPVmFKOulkrBA+ZSaG0nDG2QSN7ceSIZN1ET3wdgBgLOFom90Vw IFjaKDxecKNE8CDkszryQbPxHbor67DHYCd7dNbdJbd7unF6xDCcsk7CnJ3NERQhb6WCY3xvu PxSIc26fBmDjlygcZP6EZd8SUToisT14yX7H2pKcLYrPezsqYgoEfWbJrQ2wq5rISVXDlFG+R fMwK0TGWB6jAmaG0kzWqwYeYfHdeahda3oDLye+a2LEDKxZK1IZDdXipmStV/Rx7yAwCizD9V eEcuP+y0En51FA3fShyPKsVVIZg3vrnhnObgq//D4= 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/megaraid/megaraid_sas_fusion.c | 28 ++++++++------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index f74b5ea24f0f..a8b07e0bacbb 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -331,15 +331,11 @@ megasas_free_cmds_fusion(struct megasas_instance *instance) kfree(fusion->cmd_list); } - if (fusion->sg_dma_pool) { - dma_pool_destroy(fusion->sg_dma_pool); - fusion->sg_dma_pool = NULL; - } - if (fusion->sense_dma_pool) { - dma_pool_destroy(fusion->sense_dma_pool); - fusion->sense_dma_pool = NULL; - } + dma_pool_destroy(fusion->sg_dma_pool); + fusion->sg_dma_pool = NULL; + dma_pool_destroy(fusion->sense_dma_pool); + fusion->sense_dma_pool = NULL; /* Reply Frame, Desc*/ if (instance->is_rdpq) @@ -356,10 +352,9 @@ megasas_free_cmds_fusion(struct megasas_instance *instance) dma_pool_free(fusion->io_request_frames_pool, fusion->io_request_frames, fusion->io_request_frames_phys); - if (fusion->io_request_frames_pool) { - dma_pool_destroy(fusion->io_request_frames_pool); - fusion->io_request_frames_pool = NULL; - } + + dma_pool_destroy(fusion->io_request_frames_pool); + fusion->io_request_frames_pool = NULL; } /** @@ -807,10 +802,8 @@ megasas_free_rdpq_fusion(struct megasas_instance *instance) { } - if (fusion->reply_frames_desc_pool) - dma_pool_destroy(fusion->reply_frames_desc_pool); - if (fusion->reply_frames_desc_pool_align) - dma_pool_destroy(fusion->reply_frames_desc_pool_align); + dma_pool_destroy(fusion->reply_frames_desc_pool); + dma_pool_destroy(fusion->reply_frames_desc_pool_align); if (fusion->rdpq_virt) dma_free_coherent(&instance->pdev->dev, @@ -830,8 +823,7 @@ megasas_free_reply_fusion(struct megasas_instance *instance) { fusion->reply_frames_desc[0], fusion->reply_frames_desc_phys[0]); - if (fusion->reply_frames_desc_pool) - dma_pool_destroy(fusion->reply_frames_desc_pool); + dma_pool_destroy(fusion->reply_frames_desc_pool); }