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); }