git: 14444bf7c8cd - main - bcm2835_sdhci: Make ext_resources non-optional

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=14444bf7c8cd2bb875378e470b6fb2a85bcad0e5

commit 14444bf7c8cd2bb875378e470b6fb2a85bcad0e5
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-01-11 09:48:15 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
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);
 }