From nobody Thu Jan 02 18:28:29 2025 X-Original-To: dev-commits-src-main@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 4YPFZk15f4z5jnTw; Thu, 02 Jan 2025 18:28:30 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YPFZj1dgkz4v4r; Thu, 2 Jan 2025 18:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842509; 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=WFAACXrx3Q85bowZUAuMz0ByaaGHhcZm4VU0UjA4CAw=; b=N+3m5xCxHHpCDpFffqAuh/JfagnbDmEOs2zl/TerL+9rJXb8WFwKiT1rmaFgoVCs4UhWY0 xy96MF/0LBhWwmqcZl3WEGg5CEItIhYW/X9vmTraq9mD/eWVIzDiWARM8jtyognsxjqH2H fzNQO+H2ZfKmqwScgDt3BlNyhSJtIxuw2ZO8icU7P6BOSGjZX6fBojhST8bTGapSOJXNOk 6bA0p2RTCi3D+p0oBURtDVoMs4mGKU2Sw6+v189OFaThisy5ZS31zXq0AlqcnfGjgNK67J KEq+HQMJlVGp/OcTh7LSEZULnP00we9hqJkiugqXzASCZsd0jMp3lNWyuQeJWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735842509; 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=WFAACXrx3Q85bowZUAuMz0ByaaGHhcZm4VU0UjA4CAw=; b=VYgWV/VxfHeMt59eDVVTpF8vT0rWU2hoAMeCi/5bNJk/nQ1bmpgOUdUoDaKQeyT8iJjxI9 FcJ32yd+fEMugB1rbtcNPLAseNsjritrTcXop7iofHAkMBx2r35Hfz4ARUobqThhimAJEz vuTzo7NvzaTVQeAjuLA5/hLKuAg9n7e7ZG7yJcK+YsCjhDcnQwTL/uvMFHo/+RSdpipK7c eTQDboSM5F9ydx4CX2E5cwqXJzpSWHc3EbZj9kAHhnvnb5aa0N0ykj+8SOtwpS5QArLgJV VgBd761GgMakrSzHCHJQ47hEvZqLh/JAyUFIRfPUoQuqFsZm6L1vbNZ3LLNRyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735842509; a=rsa-sha256; cv=none; b=R0oN0uIm5gEVeJ1r8CdZGm8ys7z1WDQFo0qn4jK4m4qVtshOKbQc6Fi1Z/6NMfaKsuAKdO XJ7chvcSw36kvyG91SAPieREQ9aqWRWpu44Eee3c2HdiJGICGuab+yp13KUPDNVQ6/EgJ4 uIupjYKcaVY/gThMv0LsJYT1BSgXBJESSts6Z7cuw9d48p/3QGq9HiOmSx9Zbz7Mq3WhA7 t/1J2PN4bsHZ6bMkylizNXyl/Udbuc8Z7VDIWJTCwTXjzS1U9E6h35ZSoQu8m/UI4QW9Z1 Ui8I5Qiywr11thE0BQbo82IsNsZWaLc/tEXONJn0RBwdielShJ7fUFaRFs/vuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YPFZj116MznlC; Thu, 02 Jan 2025 18:28:29 +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 502ISTXB066574; Thu, 2 Jan 2025 18:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 502ISTlQ066571; Thu, 2 Jan 2025 18:28:29 GMT (envelope-from git) Date: Thu, 2 Jan 2025 18:28:29 GMT Message-Id: <202501021828.502ISTlQ066571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 20f932af2973 - main - bhnd bcma/siba: Remove duplicate call to device_delete_children List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 20f932af2973afc7624ac40a843b85b48a3947c7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=20f932af2973afc7624ac40a843b85b48a3947c7 commit 20f932af2973afc7624ac40a843b85b48a3947c7 Author: John Baldwin AuthorDate: 2025-01-02 18:24:13 +0000 Commit: John Baldwin CommitDate: 2025-01-02 18:24:13 +0000 bhnd bcma/siba: Remove duplicate call to device_delete_children bcma/siba_add_children already call device_delete_children if an error occurs. Differential Revision: https://reviews.freebsd.org/D47968 --- sys/dev/bhnd/bcma/bcma.c | 1 - sys/dev/bhnd/siba/siba.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/dev/bhnd/bcma/bcma.c b/sys/dev/bhnd/bcma/bcma.c index 9ce4bf04a1c5..a83873b321c2 100644 --- a/sys/dev/bhnd/bcma/bcma.c +++ b/sys/dev/bhnd/bcma/bcma.c @@ -81,7 +81,6 @@ bcma_attach(device_t dev) /* Enumerate children */ if ((error = bcma_add_children(dev))) { - device_delete_children(dev); return (error); } diff --git a/sys/dev/bhnd/siba/siba.c b/sys/dev/bhnd/siba/siba.c index ec9f22ff22af..a8e83f843506 100644 --- a/sys/dev/bhnd/siba/siba.c +++ b/sys/dev/bhnd/siba/siba.c @@ -85,7 +85,6 @@ siba_attach(device_t dev) /* Enumerate children */ if ((error = siba_add_children(dev))) { - device_delete_children(dev); SIBA_LOCK_DESTROY(sc); return (error); }