git: 78f8b4aafaa0 - main - mmc: Make ext_resources non-optional

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=78f8b4aafaa0030cfda4d1a775150441ac0a5343

commit 78f8b4aafaa0030cfda4d1a775150441ac0a5343
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-01-11 09:37:02 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-02-21 16:28:40 +0000

    mmc: Make ext_resources non-optional
    
    EXT_RESOURCES have been introduced in 12-CURRENT and all supported
    releases have it enabled in their kernel config.
    
    MFC after:      1 month
    Differential Revision:  https://reviews.freebsd.org/D33821
---
 sys/dev/mmc/mmc_fdt_helpers.c | 4 ----
 sys/dev/mmc/mmc_fdt_helpers.h | 2 --
 sys/dev/mmc/mmc_helpers.h     | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/sys/dev/mmc/mmc_fdt_helpers.c b/sys/dev/mmc/mmc_fdt_helpers.c
index 249a430311fa..239b3538cc67 100644
--- a/sys/dev/mmc/mmc_fdt_helpers.c
+++ b/sys/dev/mmc/mmc_fdt_helpers.c
@@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 
-#ifdef EXT_RESOURCES
 #include <dev/extres/regulator/regulator.h>
-#endif
 
 #include <dev/mmc/mmc_helpers.h>
 
@@ -61,7 +59,6 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper,
 
 	helper->props = mmc_helper.props;
 
-#ifdef EXT_RESOURCES
 	/*
 	 * Get the regulators if they are supported and
 	 * clean the non supported modes based on the available voltages.
@@ -98,7 +95,6 @@ mmc_fdt_parse(device_t dev, phandle_t node, struct mmc_helper *helper,
 			host->caps |= MMC_CAP_SIGNALING_330;
 	} else
 		host->caps |= MMC_CAP_SIGNALING_330;
-#endif
 
 	if (OF_hasprop(node, "mmc-pwrseq")) {
 		if (OF_getencprop(node, "mmc-pwrseq", &pwrseq_xref, sizeof(pwrseq_xref)) == -1) {
diff --git a/sys/dev/mmc/mmc_fdt_helpers.h b/sys/dev/mmc/mmc_fdt_helpers.h
index f07ca1684440..9762e2b60d92 100644
--- a/sys/dev/mmc/mmc_fdt_helpers.h
+++ b/sys/dev/mmc/mmc_fdt_helpers.h
@@ -33,9 +33,7 @@
 #include <dev/gpio/gpiobusvar.h>
 #include <dev/ofw/ofw_bus.h>
 
-#ifdef EXT_RESOURCES
 #include <dev/extres/regulator/regulator.h>
-#endif
 
 #include <dev/mmc/mmc_helpers.h>
 
diff --git a/sys/dev/mmc/mmc_helpers.h b/sys/dev/mmc/mmc_helpers.h
index e402e587a159..2788d1eb0ecc 100644
--- a/sys/dev/mmc/mmc_helpers.h
+++ b/sys/dev/mmc/mmc_helpers.h
@@ -30,9 +30,7 @@
 
 #include <dev/gpio/gpiobusvar.h>
 
-#ifdef EXT_RESOURCES
 #include <dev/extres/regulator/regulator.h>
-#endif
 
 struct mmc_helper {
 	device_t		dev;
@@ -56,10 +54,8 @@ struct mmc_helper {
 #define	MMC_PROP_NO_SD		(1 << 6)
 #define	MMC_PROP_NO_MMC		(1 << 7)
 
-#ifdef EXT_RESOURCES
 	regulator_t	vmmc_supply;
 	regulator_t	vqmmc_supply;
-#endif
 
 	device_t	mmc_pwrseq;
 };