From nobody Mon Feb 21 16:29:53 2022 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 05BB219DE225; Mon, 21 Feb 2022 16:29:55 +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 4K2SSf4ZD2z4gvj; Mon, 21 Feb 2022 16:29:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460994; 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=gpK3nWga6zAKfkoQrZha62Wli0O5b5sr4C0e66cjkHM=; b=oDTeyURQ92vDbe60Vv/Cg0DoInTXV1n/t/Z6t8ZW6aSPO758ec6oX87wXrxqAPpcvtlLqU y8xQbXN0vyAgZOSkTjpguUVkreD8AKwhFwJ+P/LsxwRlc3Q1OQ+CoFvAQwRfNL9Z7fkTce 6wtpsLnkpWi1kgniN2SdB/6jXgcK10XRO0saBTCi56P0iRRPdua2ktNPEALcD/V25Cp4KZ at3ah/4Dg9vW4WHyJcDlA/ad2Xge7N1nDgGDpb3Hjc2h7ADcclCTFdXjNZDfiRbz5fLKIq 8CZramBWEpXNtMWwhvvs/4mCLSqnkKxdElo9gVioHFhhw3Bj/gAK+qgLpPbA3A== 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 10648139A1; Mon, 21 Feb 2022 16:29:54 +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 21LGTrto008508; Mon, 21 Feb 2022 16:29:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LGTrLl008507; Mon, 21 Feb 2022 16:29:53 GMT (envelope-from git) Date: Mon, 21 Feb 2022 16:29:53 GMT Message-Id: <202202211629.21LGTrLl008507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 14444bf7c8cd - main - bcm2835_sdhci: Make ext_resources non-optional 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14444bf7c8cd2bb875378e470b6fb2a85bcad0e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645460994; 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=gpK3nWga6zAKfkoQrZha62Wli0O5b5sr4C0e66cjkHM=; b=tvFErPfnArZMaK1ef8/uCSamXrFBsgIxlCnqHJDwhX977oEMnCOMuOxhRj1IS1H5OCZwaK SIXo57nhsul9UH8r1Ol7t9gLN6jT8bjyKwwib9xBKP48EHPRGOIibrpmyAUWQba/J5z2CO IdgHa3H2wLzy2jIyNLGl9Fz7xuMI+w1oUP1fo4bwqji8jpXN1L73ZD6SuqmCdMDhhLPPDY BOcjYSa2pfWeBYatZv4AyHecUFbQs+1UhiKRWe283S8k06iSo5iuUIgmFviFAavnw6o2xJ 1qWk3MqMrvz1yGQCSuceug1v2vEXLptA71J6KFaUuyz3kw0GuDQ4ngyV4yoZXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645460994; a=rsa-sha256; cv=none; b=Lj6gMD/YULNrAjCB6B4kaitJdRwLEoJxH8Bm7GKwI03j8sCQp/6IxGtcgCG+Wf9fTGj5/s 0fCp9xLnI3CqnZ6bCuSJnsRTdDUuX+emT0KXYWyhMwPduIcTl0467LFCMUahEP7wpkgRuK US4BpaMPK9vaGiXC7AZ7A3Jy755Fh0SNApj4UH2wvC99B2CfAtG+K3dseT5y90ZYCKs/bF AvRhYCazqUvnMjd1XXgTh0tyA4joAZrHgla1Ni2PZi7gbWXFhM0a+5K/vLAW76A5sVMoXZ vi1ApiZSHS+s4AiFIjdvDqQyLX3BTfYrJcx9SmsT/rnx0/OnQ90U0Fd8ahw8Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=14444bf7c8cd2bb875378e470b6fb2a85bcad0e5 commit 14444bf7c8cd2bb875378e470b6fb2a85bcad0e5 Author: Emmanuel Vadot AuthorDate: 2022-01-11 09:48:15 +0000 Commit: Emmanuel Vadot CommitDate: 2022-02-21 16:28:56 +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 --- 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); }