From nobody Thu Feb 27 16:55:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z3csz4Ygbz5qNdC; Thu, 27 Feb 2025 16:55:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3csz3mfZz45wm; Thu, 27 Feb 2025 16:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740675351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zljk37+rKd1B3nI71W6ANQTt3Q09/nBHVvaMPm9MOWM=; b=l6L3FtGUxmLVja1yz6B28coGeTydkrjniCIAcTEszDnDCA2i8lGFC7kYPD1zblXKkq9CxM TEgzuGPvHWwTAp3LFHf37um8y3rUNKvu3hVrBAstG0mtPUS3NNqjlnYgPgOeGPFrU5ikiI cdAeyCxl0ehuzoyl9+eIrqPl0E5w01xLZ40vs9UyuGE+4uoIZ4j+gB/EmFuwdkt86BqshE YelohQ73CTujIWZe50e0+kx8WuotWk+koDgvc+a/LmebVMq8oHrYZ/r6A3k35WBuVMc5b7 JPantLh8wXP2iKDj4mALctUYye80xCWP/3vuL5SIatjRxC+fTmMgrQsOfn1HxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740675351; a=rsa-sha256; cv=none; b=muHxVVLGLvCMId4uXnficsYR89A7AvtFm4MhUUraOt4CnBisNHmX6ZsJhSECVw6yuMVcBc RspcWbBg8meYQd8oGy1UHk9zRzt6Ft8FQpuhKaCvkxcfsUAWz02GIN9cChM9o0dY3LXk4X YaADoY5dPJ8xHRATuwBtpQHqhLEg+uW6WvwQpZpe3O4DuQWDtJLCdGSPE9Hq7Os5ASjrKb z8CuQHpVT7bREkG9B7Gr654RMkqMz81i4WhVKxZBeM//8vGbnZtozC3ysHy/hwbS5jh23s LemZpNm7+CFDWo0xHAhjPj5odehfWaVagse2am8qr+oURcuODVV5HaIOxMUvLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740675351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zljk37+rKd1B3nI71W6ANQTt3Q09/nBHVvaMPm9MOWM=; b=K7n5KN6XYnbwMpLv2wZW6805cG5Hyt79f+KpH4ZHOWbkKTmgPG/oWVnyWbIa4uFBVlIlDA kJQncXIaPvOFw6ZFCMyIP27Qe2sKWv0/xnnzW0ZwmoRTELgB1Yyfcftf3B7v5scCOqcZwx PynV8qb+hsZDd0xSA+9e92kYn6YydYhXN13mzCLW36AaGx7p6ZyNUiJ2Sxctf2j/35YOPB LsHessm7Lg2CyDN6170bSr/JGZj6ecJyuUY4PUXLWq7Lz8+/NPmMZZu46rAu+RtDEIm6Ps 538tT/xyDfmkA8k7jr0FBnRE/JWbjHIsPqTAvNYTGvPlO28fpjCLthJHca+7PQ== 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 4Z3csz3CPkzrGm; Thu, 27 Feb 2025 16:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51RGtpvq016917; Thu, 27 Feb 2025 16:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51RGtpY9016914; Thu, 27 Feb 2025 16:55:51 GMT (envelope-from git) Date: Thu, 27 Feb 2025 16:55:51 GMT Message-Id: <202502271655.51RGtpY9016914@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 7a88ac783b97 - stable/14 - dpaa2_mc: Check for error the first time bus_generic_detach is called List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a88ac783b97acf59209a96eae49f367b0afefad Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7a88ac783b97acf59209a96eae49f367b0afefad commit 7a88ac783b97acf59209a96eae49f367b0afefad Author: John Baldwin AuthorDate: 2024-11-05 01:30:53 +0000 Commit: John Baldwin CommitDate: 2025-02-27 15:17:57 +0000 dpaa2_mc: Check for error the first time bus_generic_detach is called This removes the need for the second call. Reviewed by: dsl Differential Revision: https://reviews.freebsd.org/D47388 (cherry picked from commit 24d5a8e6eec2b9eed9591971f223d79b8d7044c9) --- sys/dev/dpaa2/dpaa2_mc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_mc.c b/sys/dev/dpaa2/dpaa2_mc.c index a6b56be10432..792745a535b3 100644 --- a/sys/dev/dpaa2/dpaa2_mc.c +++ b/sys/dev/dpaa2/dpaa2_mc.c @@ -281,7 +281,9 @@ dpaa2_mc_detach(device_t dev) struct dpaa2_devinfo *dinfo = NULL; int error; - bus_generic_detach(dev); + error = bus_generic_detach(dev); + if (error != 0) + return (error); sc = device_get_softc(dev); if (sc->rcdev) @@ -292,10 +294,6 @@ dpaa2_mc_detach(device_t dev) if (dinfo) free(dinfo, M_DPAA2_MC); - error = bus_generic_detach(dev); - if (error != 0) - return (error); - return (device_delete_children(dev)); }