From nobody Mon May 16 12:09:47 2022 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 BC47D1ADDFA0; Mon, 16 May 2022 12:09:48 +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 4L1yjl6Lknz4cTQ; Mon, 16 May 2022 12:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702988; 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=9pV15meNBYqP9TuJLX1KGl0StFIedhmmY670N4jxg64=; b=wR4rbMENlDoBCmh4XIc/WlV2CU4Qn8Lj9BhZQK/w/CgfPkv+Fdn1DCmcJW0IA3jqmC/ngq mxE+N6EpMGIEkqw6kSGCB2X6+BkNOcaK19RXEziSz071m35PirbioqZPsEv6Z8CCjVTyQz 39Qk4R1zH23OAPIqTmHdve+B57F0/or8ZovYi8wQvgE3WKJ62ho2l7kZd0qgQXZG9UBGPW wHA/59rGcpBnNOuEHHtQksZCV0dCE0kEm9OZ0XoFlroWkKIRU04hSllhaFFJXmOYng/Xyj WulFc5eZoPocCm3NK0BAzfMvnONA3xVEMtWGimloGAM9GAshUh3jSMn9110lEQ== 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 43FC21FB66; Mon, 16 May 2022 12:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24GC9lxf035325; Mon, 16 May 2022 12:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GC9lJ2035324; Mon, 16 May 2022 12:09:47 GMT (envelope-from git) Date: Mon, 16 May 2022 12:09:47 GMT Message-Id: <202205161209.24GC9lJ2035324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 4117848ac879 - stable/13 - bcm2835_sdhci: Make ext_resources non-optional 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4117848ac87976182b8b67fa1a15a288e46956ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652702988; 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=9pV15meNBYqP9TuJLX1KGl0StFIedhmmY670N4jxg64=; b=wTuPtzwrd8G42PV5qzeelvlEkkY5bALyRpDqXdOc4dUgQXOVWZCAeNK2+VecGLG9+byisn w0iYvVps1kYs8c4SIi8absF7XZtdBt3ILjptrGqtkL2YS+FuDu73VsvQizeHr6/Y1xqO0A vCISyyH9wXaKQ9RQYXAHtWnwn9r0IBSSghzaqIvxlx5tdx96VH/pReE4MR3lVqZOJsTmui tdYB9kDZszmXcj6h8YIl7YAPKPEYUig2WYwoywHDX9gfymUROiYM50D8PBmUo/ZgmwIgtO eYAz+I4MRsjxZgN2v96bB6BGhNxFYpSnv+6TMddL+OIFCEtcS5K63cSwgoe2+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652702988; a=rsa-sha256; cv=none; b=lWNhF50ZTiJb2zXqAi6WoszcPJtIRIB5z4dTiOEya3bKeugWntqCAzzm0oy94nAFAf7tdD 8xg1momuXwrtQno72DQblLAsvxSTwXA0WdzUlt2Fh8Z4ZHkPVAHSZXhU87D42Rzy/ZNn+J mbWYHKzc94Rz3qaDcne8iw4aLLWJhHlhmr07hSLmyd1JPEr1rL5xjnh2t5TVI3WxEzsprl pQCoZjyzkESA9mfvjKnzPz+abxArPAgU7P4JUgm7a2ABjWbrus+C3bD/h5zNwoz3SqwDc8 aOYR/DiJGJp8CNEU0AR7Wf2N6uymk/6BmcZ3g4VD6BNUGmWsqADR+nCgPGV5MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4117848ac87976182b8b67fa1a15a288e46956ee commit 4117848ac87976182b8b67fa1a15a288e46956ee Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:48:15 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 11:45:37 +0000 bcm2835_sdhci: Make ext_resources non-optional EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. Reviewed by: kevans MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33829 (cherry picked from commit 14444bf7c8cd2bb875378e470b6fb2a85bcad0e5) --- sys/arm/broadcom/bcm2835/bcm2835_sdhci.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c index c8725b6067f6..8225abcb624c 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c @@ -395,13 +395,10 @@ bcm_sdhci_intr(void *arg) static int bcm_sdhci_update_ios(device_t bus, device_t child) { -#ifdef EXT_RESOURCES struct bcm_sdhci_softc *sc; struct mmc_ios *ios; -#endif int rv; -#ifdef EXT_RESOURCES sc = device_get_softc(bus); ios = &sc->sc_slot.host.ios; @@ -411,20 +408,17 @@ bcm_sdhci_update_ios(device_t bus, device_t child) if (sc->sc_mmc_helper.vqmmc_supply) regulator_enable(sc->sc_mmc_helper.vqmmc_supply); } -#endif rv = sdhci_generic_update_ios(bus, child); if (rv != 0) return (rv); -#ifdef EXT_RESOURCES if (ios->power_mode == power_off) { if (sc->sc_mmc_helper.vmmc_supply) regulator_disable(sc->sc_mmc_helper.vmmc_supply); if (sc->sc_mmc_helper.vqmmc_supply) regulator_disable(sc->sc_mmc_helper.vqmmc_supply); } -#endif return (0); }