From owner-dev-commits-src-main@freebsd.org Thu Jun 24 14:35:50 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3C83B64D461; Thu, 24 Jun 2021 14:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G9jNk0sh7z4cQ9; Thu, 24 Jun 2021 14:35:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CDAAB19AB3; Thu, 24 Jun 2021 14:35:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15OEZnUh032467; Thu, 24 Jun 2021 14:35:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15OEZngG032466; Thu, 24 Jun 2021 14:35:49 GMT (envelope-from git) Date: Thu, 24 Jun 2021 14:35:49 GMT Message-Id: <202106241435.15OEZngG032466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marcin Wojtas Subject: git: ddec69e6a796 - main - ena: remove surplus NULL checks when freeing ENA resources MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddec69e6a796283497ebada0569f34bd41bbdf37 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jun 2021 14:35:50 -0000 The branch main has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=ddec69e6a796283497ebada0569f34bd41bbdf37 commit ddec69e6a796283497ebada0569f34bd41bbdf37 Author: Marcin Wojtas AuthorDate: 2021-06-14 08:57:49 +0000 Commit: Marcin Wojtas CommitDate: 2021-06-24 14:02:39 +0000 ena: remove surplus NULL checks when freeing ENA resources Calling free on a NULL pointer is valid, as appropriate check is already done internally: /* free(NULL, ...) does nothing */ if (addr == NULL) return; Submitted by: Artur Rojek Obtained from: Semihalf MFC after: 2 weeks Sponsored by: Amazon, Inc. --- sys/dev/ena/ena.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c index 20da750bcac0..d7a68e94d361 100644 --- a/sys/dev/ena/ena.c +++ b/sys/dev/ena/ena.c @@ -1898,8 +1898,7 @@ ena_disable_msix(struct ena_adapter *adapter) } adapter->msix_vecs = 0; - if (adapter->msix_entries != NULL) - free(adapter->msix_entries, M_DEVBUF); + free(adapter->msix_entries, M_DEVBUF); adapter->msix_entries = NULL; } @@ -3863,11 +3862,9 @@ ena_detach(device_t pdev) if_free(adapter->ifp); - if (ena_dev->bus != NULL) - free(ena_dev->bus, M_DEVBUF); + free(ena_dev->bus, M_DEVBUF); - if (ena_dev != NULL) - free(ena_dev, M_DEVBUF); + free(ena_dev, M_DEVBUF); return (bus_generic_detach(pdev)); }