Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6242247imu; Sun, 2 Dec 2018 13:18:13 -0800 (PST) X-Google-Smtp-Source: AFSGD/UPkWuQpHyUaP7xYWSG3HmiR1n24B8mLIllCUfQldNxvYtVMAwRMggtDNGSdIIv8UZkN5pk X-Received: by 2002:a63:7f4f:: with SMTP id p15mr10147295pgn.296.1543785493058; Sun, 02 Dec 2018 13:18:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543785493; cv=none; d=google.com; s=arc-20160816; b=m0nBG73+f1P4jC3Q5EiAqdZK/HcALPH1/CL6OvR53i3d238uehbMXdZBUuRxQKHrGQ v6EueD+MfSinXlfe9uqRFwaq/hnvXDVkJIiJhSZ+vKxx2p3qMZaLJjD1cyiKvW9ny6qr jEsmOspikPK+8xASe6bSv8lVBggjzTbJZ31KwpyHbRzSMuIPXQOqfhcT52+MFWrtcAU3 Pee+zWnQHhkNkgpSsWhjrp2Qx1YIFaTCbU6AmH9hI0Il6GocQAJNdJ2N8DGxtiHtR0jZ zyKLz89qdjKCntrhAiOrl5LsxsoRDcMI8jA1H38yHKT/I71TSgtmQ5qJ97bloMM7IMm1 lWhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:user-agent:date :in-reply-to:references:message-id:mime-version:to:from:subject; bh=ndPGQA0MERXK+laPgzDNcvIVXDV+oyo7RkWJZ6NG1nE=; b=iuat5YI01xJWG4ZwOCtq+nInLKfQdhREgJmkGhujhMAZHuM3HcBzcLlAhwnyerN2aQ nWFpZNV9yp0QVlPAtW3VrXF41JphD/DdIqKiwbVC4IeiwQwDywO6nomfvqnnB/CGTJ8p 3UdYRUKyjHBKQsr7rsY1/v7KUU+uXTtBnpdHFnrnbn+dnyTqwEBZg+yZY0odhqeWkXWi WWB393/Vl0jFNW5RDzWr+wyI/ibK6MHEsCwEApPLN+envheqKF9sAcfP4FnpQkrhUDeL JUKIM1uTyybFS8wiTz8ilL5aac/2L59sLW/m7hqhR7IOGXW4rwFPcmBlyau8z8ImDDn+ fsqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i69si11658007pgd.71.2018.12.02.13.17.58; Sun, 02 Dec 2018 13:18:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726013AbeLBVQE (ORCPT + 99 others); Sun, 2 Dec 2018 16:16:04 -0500 Received: from www17.your-server.de ([213.133.104.17]:57720 "EHLO www17.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726006AbeLBVQC (ORCPT ); Sun, 2 Dec 2018 16:16:02 -0500 Received: from [78.46.172.3] (helo=sslproxy06.your-server.de) by www17.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1gTYlp-00015z-Dz; Sun, 02 Dec 2018 21:55:17 +0100 Received: from [2a02:908:4c28:3f60:fff6:43c5:695c:41d6] (helo=localhost.localdomain) by sslproxy06.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1gTYlp-0002e9-8B; Sun, 02 Dec 2018 21:55:17 +0100 Subject: [PATCH] scsi: megaraid_sas: NULL check before some freeing functions is not needed. From: Thomas Meyer To: kashyap.desai@broadcom.com, sumit.saxena@broadcom.com, shivasharan.srikanteshwara@broadcom.com, jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, megaraidlinux.pdl@broadcom.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 X-Patch: Cocci X-Mailer: DiffSplit Message-ID: <1543760930052-918941928-10-diffsplit-thomas@m3y3r.de> References: <1543760930050-1499171309-0-diffsplit-thomas@m3y3r.de> In-Reply-To: <1543760930050-1499171309-0-diffsplit-thomas@m3y3r.de> X-Serial-No: 10 Date: Sun, 02 Dec 2018 21:52:11 +0100 User-Agent: Evolution 3.30.2 (3.30.2-2.fc29) Content-Transfer-Encoding: 7bit X-Authenticated-Sender: thomas@m3y3r.de X-Virus-Scanned: Clear (ClamAV 0.100.2/25173/Sun Dec 2 15:13:44 2018) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org NULL check before some freeing functions is not needed. Signed-off-by: Thomas Meyer --- diff -u -p a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c @@ -1243,8 +1243,7 @@ megaraid_mbox_teardown_dma_pools(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 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 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; } diff -u -p a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c @@ -1017,8 +1017,7 @@ memalloc_error: 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); diff -u -p a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -807,10 +807,8 @@ megasas_free_rdpq_fusion(struct megasas_ } - 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 +828,7 @@ megasas_free_reply_fusion(struct megasas 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); } @@ -1627,8 +1624,7 @@ static inline void megasas_free_ioc_init fusion->ioc_init_cmd->frame, fusion->ioc_init_cmd->frame_phys_addr); - if (fusion->ioc_init_cmd) - kfree(fusion->ioc_init_cmd); + kfree(fusion->ioc_init_cmd); } /**