From owner-svn-src-all@freebsd.org Wed Dec 11 19:40:31 2019 Return-Path: Delivered-To: svn-src-all@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 9C0E41DF613; Wed, 11 Dec 2019 19:40:31 +0000 (UTC) (envelope-from manu@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Y6jC3gNXz4Z89; Wed, 11 Dec 2019 19:40:31 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 793BE1826F; Wed, 11 Dec 2019 19:40:31 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBBJeVQJ051011; Wed, 11 Dec 2019 19:40:31 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBBJeVH5051010; Wed, 11 Dec 2019 19:40:31 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201912111940.xBBJeVH5051010@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 11 Dec 2019 19:40:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355629 - head/sys/dev/mmc/host X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/dev/mmc/host X-SVN-Commit-Revision: 355629 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Dec 2019 19:40:31 -0000 Author: manu Date: Wed Dec 11 19:40:30 2019 New Revision: 355629 URL: https://svnweb.freebsd.org/changeset/base/355629 Log: dwmmc: Use device_delete_children Instead of first detaching the children(s) and then delete them, use the device_delete_children function that does all of that. MFC after: 1 month Suggested by: ian Modified: head/sys/dev/mmc/host/dwmmc.c Modified: head/sys/dev/mmc/host/dwmmc.c ============================================================================== --- head/sys/dev/mmc/host/dwmmc.c Wed Dec 11 19:32:52 2019 (r355628) +++ head/sys/dev/mmc/host/dwmmc.c Wed Dec 11 19:40:30 2019 (r355629) @@ -752,7 +752,7 @@ dwmmc_detach(device_t dev) sc = device_get_softc(dev); - ret = bus_generic_detach(dev); + ret = device_delete_children(dev); if (ret != 0) return (ret); @@ -765,12 +765,6 @@ dwmmc_detach(device_t dev) return (ret); } bus_release_resources(dev, dwmmc_spec, sc->res); - - if (sc->child) { - ret = device_delete_child(dev, sc->child); - if (ret != 0) - return (ret); - } DWMMC_LOCK_DESTROY(sc);