From nobody Wed Oct 16 18:09:18 2024 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 4XTJrb44v3z5YqFs; Wed, 16 Oct 2024 18:09:19 +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 4XTJrZ6c5Mz4r4r; Wed, 16 Oct 2024 18:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729102158; 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=prM1F9AXVMTttV8aJ/nki/+lrqVrnN/LScDcXC1ryy0=; b=NzfYykyVeeNUJedIaNCsuWnT6Py32yuQDUImJVnGN0GQ3AVP+Nrp0E6cKy9AYTvbgao/3O f/qtoRF7dC+VWD2w7qMPC3ayLYUsfrBMFjLDGxpaEuQRl6/b3X62iTT1lyzFk5qHWgU0MM F3ZngrebWGDo1zhwDZGgJYA/eSCwb0EVaqjz/JS+PavmcVQbQG8073sjixWRO/pxSHEva+ JDIyNAYfBFpaVDVD2FDX8X1QwrZoIW/d8dMLc/7tZNbLCfO8LQHq3sy5ilKZnkkJzWbaY+ l4emj3J1TgOV81/f63g3GN6B5rZTJRqamivnRNQ9mOzz+loW7XyJin+4rbIc4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729102158; 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=prM1F9AXVMTttV8aJ/nki/+lrqVrnN/LScDcXC1ryy0=; b=h5aostGddalhaj4eTRIYKHA/wtAOnlXwoRzflgoHYouTxhl+NijEaro8qPjNnHPoXTfAZR 9hvVMZ5TnDB86ADlXcWM9zGv/beAPDHqFlLjBIkLtCMH4DgJ4qZcOFFRuEeUG6q4dJgR0x W14KP5YUZX5i09dB95pJ4eDq4EmcgQGFDojl08dFKIPnbJkrFK2ivc7Cju6UCfkH7vJiGU Bb2wsPOqVvagNSxzeew/W+PPwIboga8aBcfWTAhrsMaseRpqQhyo4+iDlQPSlWtPbuMU1u AJyrjlXoENBQUu8aFmRKNJ6gqpRjt9LGA6JkfAy848DmXsrJwi9C67suXhGjFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729102158; a=rsa-sha256; cv=none; b=dtfWSo7pa/Wc1GL73LqQvdoRo3TJuMl9iN9KjllX3RiVK5dU4uRG9H2N/b1olTscQoVGcI th//wlmd0r8gI9pmDPD2RklwC2CyjvPQPtovgRHz90gW+VPUSbjAD9jVKwCVdI7vi7k7fa R+JZRZkP7BEWBFJwSsBHLoo27boOhNuwsII+eorowPaPKTS6zJvayH8Fo1RUzorHQao3C+ 3WTMqB7eBgyXquLhiyIt/Wptuml7VUXVN7dnHPIoH56xI8T+okzsVb1wD1ueF7obEo10G0 lkFlIa6nv4yFLmU0LaCWt2yhB2RR2k5O5a3lDXOVVlaCNUuwO8tCe2flkXYLrA== 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 4XTJrZ67BwzGWW; Wed, 16 Oct 2024 18:09:18 +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 49GI9IHe046396; Wed, 16 Oct 2024 18:09:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49GI9IC4046393; Wed, 16 Oct 2024 18:09:18 GMT (envelope-from git) Date: Wed, 16 Oct 2024 18:09:18 GMT Message-Id: <202410161809.49GI9IC4046393@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: 3342afcbaf42 - main - bus_generic_detach: Remove redundant check 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: 3342afcbaf42c2e6a4604c84e267901411e790ca Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3342afcbaf42c2e6a4604c84e267901411e790ca commit 3342afcbaf42c2e6a4604c84e267901411e790ca Author: John Baldwin AuthorDate: 2024-10-16 18:08:49 +0000 Commit: John Baldwin CommitDate: 2024-10-16 18:08:49 +0000 bus_generic_detach: Remove redundant check device_detach() checks the device state and only calls a driver's DEVICE_DETACH method if the device is attached but not busy. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D47156 --- sys/kern/subr_bus.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 7140ca007b71..7c21325f8684 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -3405,9 +3405,6 @@ bus_generic_detach(device_t dev) device_t child; int error; - if (dev->state != DS_ATTACHED) - return (EBUSY); - /* * Detach children in the reverse order. * See bus_generic_suspend for details.