From nobody Thu Aug 3 16:11:56 2023 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 4RGv4F0Drnz3cNq0; Thu, 3 Aug 2023 16:11:57 +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 4RGv4D6fLWz4WNK; Thu, 3 Aug 2023 16:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079116; 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=+giGBKHb3n2UUjpo/5NTc84tV8L1S+qes2SwONp2+38=; b=IYAMqBV7y5Dl1h/r27JU24SCxtWnV8kZyJnMbAT0BVI6jCx44hi8umRkYgalhMhOZIOrHN RyG3wH0dOeDfc6zQ3YlDrfxiJXLu9shRV0HqGwwUDTr8tZe2+6LN/ku9cFIe1ZZROGu1MH jg5CG/5txDzUe4u/a1RtynvRVaJ+EM3sNPYGbMUcx3XRQEF3Fc9DJU2lxhfbI+qaCTFH9m qigW0uHhBYJQu+gG/3miGTTQtaMlbLJOSp2h0IVxsQaLXK9Hv49RMfsmpQyuuMRyvUoZuu +bGApskWN8UVMiDFWbKobHKt2IFBqApAtMBMFb7q3SJo3p/NCeXR5lso9S04Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691079116; 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=+giGBKHb3n2UUjpo/5NTc84tV8L1S+qes2SwONp2+38=; b=C/xq3YXms+8FpmutoF7zquLBATh8XMQ5SjbnuVf03xfDSv/734SoGFY1WRd0J+OL8MJEfm qEsbqRWV1wPFsYWJizhqH8+9hT2lsRp5o+z79nDD9H6sa7phCemB2FGkj1IvQV+W2ylVQ8 g4TDGhz5h3wtyAJ72lpm9KybuPfWhgVmmBrso5rUQ8xMniariUFHwk61Kn/i4en8NSDq/q Z2L6d9MX72CqEO1UBMZHqWY1xGLTXRTR8bsqahW15HO/211tZilYc3URBsRFwYThTH/FTB qGK2592lktqw4e4C7ddcrvrdlM/b3pOSO64JzniJWLORjtJaJOZyPXisPAOZIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691079116; a=rsa-sha256; cv=none; b=w/Iwu1eAnCdOKN1gXwKMeCOsGAO2DUnnhRqj1jCtfCUbIpzLJhyVkcZIZQ4fzvJ5Zj5hmd Phmuju3Ay3wpviWRkTmvBzTHHC1Tq1zJ7bUIUGkFfOgCx4xfDA3OMNrvPZ+ROingwjy1Tg RLBgdB9AEQYGGToeloj4pLItEGIglSygqhJrnDmVTsdqWjFDaIGPtv2UdRUw24gMUiQ9Gs GUoyky0qZh+zPvFu1QQLHwIhloOSOHgJa3gXBQF8c87rDYWHOREZNWW4xYPH0XqkbUI59S I0cTUGOe1o4dKxGMN6vrCMktkDw7LwD4kmz2cXS2nVULMZY+72a8rvwtfrQ78A== 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 4RGv4D5jPnzCXr; Thu, 3 Aug 2023 16:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 373GBubw005962; Thu, 3 Aug 2023 16:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373GBuVJ005961; Thu, 3 Aug 2023 16:11:56 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:11:56 GMT Message-Id: <202308031611.373GBuVJ005961@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 1e55a130620e - main - spibus(4): Skip bus_generic_detach() on device detach 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e55a130620e5bef3570c4e1d326412c614fba84 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=1e55a130620e5bef3570c4e1d326412c614fba84 commit 1e55a130620e5bef3570c4e1d326412c614fba84 Author: Vladimir Kondratyev AuthorDate: 2023-08-03 16:10:49 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-03 16:10:49 +0000 spibus(4): Skip bus_generic_detach() on device detach device_delete_children() detaches all children too. MFC after: 1 month Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41240 --- sys/dev/spibus/spibus.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c index 40ebb916a649..b9b3e8d28b83 100644 --- a/sys/dev/spibus/spibus.c +++ b/sys/dev/spibus/spibus.c @@ -70,13 +70,7 @@ spibus_attach(device_t dev) static int spibus_detach(device_t dev) { - int err; - - if ((err = bus_generic_detach(dev)) != 0) - return (err); - device_delete_children(dev); - - return (0); + return (device_delete_children(dev)); } static int