From patchwork Sun Nov 4 13:02:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10666861 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 3A1A214E2 for ; Sun, 4 Nov 2018 13:03:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B27629A60 for ; Sun, 4 Nov 2018 13:03:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B22029A66; Sun, 4 Nov 2018 13:03:00 +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 9613329A60 for ; Sun, 4 Nov 2018 13:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729486AbeKDWRx (ORCPT ); Sun, 4 Nov 2018 17:17:53 -0500 Received: from mout.gmx.net ([212.227.17.21]:43997 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729462AbeKDWRx (ORCPT ); Sun, 4 Nov 2018 17:17:53 -0500 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MEsXW-1gKuri1Eja-00G4Yk; Sun, 04 Nov 2018 14:02:49 +0100 Received: from localhost.localdomain ([113.116.49.156]) by mail.gmx.com (mrgmx101 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MEsXW-1gKuri1Eja-00G4Yk; Sun, 04 Nov 2018 14:02:49 +0100 From: Chengguang Xu To: james.smart@broadcom.com, dick.kennedy@broadcom.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, Chengguang Xu Subject: [PATCH] scsi: lpfc: remove unnecessary condition check in lpfc_mem_free() Date: Sun, 4 Nov 2018 21:02:31 +0800 Message-Id: <20181104130231.19027-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 X-Provags-ID: V03:K1:Dfr2rhilGRkipz0WaIk0pTAcIl108/zlwGe1VZZcEEwQJf5PzvB 2sB6xYFAaH9mCffUBH50Xz+j7swyNBkusjnNNDO+l16VPZNp1MuELx+s+WMm+CCf4/H22bU ZHogOj8087QUD+j+MmDnySVxmnkxojZJ3s9TBTnmBhg2nRQ1tfWpjc2M7p4zatATNzeR9bH aRgwWV4A8QkClpdg2ig6Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:TeZTZXDueFw=:wwntLkIVtrBJUrTTkuFRJr Uu9hho6q2v8rK+w1c8EwinhOw8QmuPRtMLlcJLb+ogt8CWH91AKEcKf9KBw08MTcmOWJVAFLO LR6nMioUjdD0gHkf7xl7FlbiftoORXH0xbgj2ICWh6mP+3a8V5rNh0UDijqTjpbyLnHKpBnr+ 3Syn8LVESUXNfJYotFhEbNV4xtKd1YmSBzoBpT8C+9mZ0HijC225isS8a9Sp/wNZvpS556xhL 8xg47MRQxcJkmddsEroVg7/16Av+hkwRqZtLPoLpIYkAGUeLEGXotrVZWSIcTOmN6KBuaGLmz Dwwokpx+vc9kzEXyEk2yPLObfnztaRE7r674c0rKwnVYHqAXOOBOHH26Hbhlw7dK05BClkx6I WNaWU7hhh3gDXeTe3zI80yfabAZFQFpKn+IwtXHb4j6k7syndAKMjIhYs/FxHykiVBIDFlr7A huLmk+XdcK0sP/eLEbcU1kq7VVgNKqi4TkiQdX/UkMvQlt87zD6WrKLkzYvdkzmdrlBKKfpkU VzsV0R22/dL0PANpLN22RJsuY+5bOt7Nkj/usiHUL2/H9gIH5//NxmT6rgWCo2knlT6i1aZ6i eMb8+46qUjRMyPH6EawiUBNHv5CcK0Zn2znpMc3eNso1+DAFNpLxlrXL4hCQIBYng0Fh48G9W EXnakx7HQr1IELw0CZzD34y/8nFLiTzQ+8gzwoH5Jm+psUrOSgppAtqW5q61WSpl0ZoxJD736 Ykis/6gcgcX2hRukdfQ+oQdYlkFKrWnRkxiyMNeQ3wfCSqp7YE1kF5LRsKzpx5ebprsAET7c0 c/Mwucqhi5Q1gE8ru2esB3sOPIIxA== 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/lpfc/lpfc_mem.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index 9c22a2c93462..0c5e840b4f95 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c @@ -248,25 +248,19 @@ lpfc_mem_free(struct lpfc_hba *phba) /* Free HBQ pools */ lpfc_sli_hbqbuf_free_all(phba); - if (phba->lpfc_nvmet_drb_pool) - dma_pool_destroy(phba->lpfc_nvmet_drb_pool); + dma_pool_destroy(phba->lpfc_nvmet_drb_pool); phba->lpfc_nvmet_drb_pool = NULL; - if (phba->lpfc_drb_pool) - dma_pool_destroy(phba->lpfc_drb_pool); + dma_pool_destroy(phba->lpfc_drb_pool); phba->lpfc_drb_pool = NULL; - if (phba->lpfc_hrb_pool) - dma_pool_destroy(phba->lpfc_hrb_pool); + dma_pool_destroy(phba->lpfc_hrb_pool); phba->lpfc_hrb_pool = NULL; - if (phba->txrdy_payload_pool) - dma_pool_destroy(phba->txrdy_payload_pool); + dma_pool_destroy(phba->txrdy_payload_pool); phba->txrdy_payload_pool = NULL; - if (phba->lpfc_hbq_pool) - dma_pool_destroy(phba->lpfc_hbq_pool); + dma_pool_destroy(phba->lpfc_hbq_pool); phba->lpfc_hbq_pool = NULL; - if (phba->rrq_pool) - mempool_destroy(phba->rrq_pool); + mempool_destroy(phba->rrq_pool); phba->rrq_pool = NULL; /* Free NLP memory pool */