regulator: don't try to use DT information without CONFIG_OF

The coupled regulator support requires CONFIG_OF today, otherwise we get a link error:

drivers/regulator/core.o: In function `regulator_fill_coupling_array':
core.c:(.text+0x3e44): undefined reference to of_parse_coupled_regulator' drivers/regulator/core.o: In function regulator_register':
core.c:(.text+0x5eb4): undefined reference to of_get_n_coupled' core.c:(.text+0x5f08): undefined reference to of_check_coupling_data'

This changes the affected functions to return success when CONFIG_OF is disabled, which should result in the same behavior as before.

---
 drivers/regulator/core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

index dedf737a2bad..dbc3381105fb 100644
@@ -4351,6 +4351,9 @@ static int regulator_register_fill_coupling_array(struct device *dev,
 {
 	struct regulator_dev *rdev = dev_to_rdev(dev);
 
+	if (!IS_ENABLED(CONFIG_OF))
+		return 0;
+
 	if (regulator_fill_coupling_array(rdev))
 		rdev_dbg(rdev, "unable to resolve coupling\n");
 

@@ -4359,7 +4362,12 @@ static int regulator_register_fill_coupling_array(struct device *dev,
 
 static int regulator_resolve_coupling(struct regulator_dev *rdev)
 {
-	int n_phandles = of_get_n_coupled(rdev);
+	int n_phandles;
+
+	if (!IS_ENABLED(CONFIG_OF))
+		return 0;
+
+	n_phandles = of_get_n_coupled(rdev);
 
 	if (n_phandles + 1 > MAX_COUPLED) {
 		rdev_err(rdev, "too many regulators coupled\n");

2.9.0

The patch

regulator: don't try to use DT information without CONFIG_OF

has been applied to the regulator tree at

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From: Arnd Bergmann <[email protected]>
Date: Tue, 6 Mar 2018 13:33:09 +0100
Subject: [PATCH] regulator: don't try to use DT information without CONFIG_OF

The coupled regulator support requires CONFIG_OF today, otherwise we get a link error:

drivers/regulator/core.o: In function `regulator_fill_coupling_array':
core.c:(.text+0x3e44): undefined reference to of_parse_coupled_regulator' drivers/regulator/core.o: In function regulator_register':
core.c:(.text+0x5eb4): undefined reference to of_get_n_coupled' core.c:(.text+0x5f08): undefined reference to of_check_coupling_data'

This changes the affected functions to return success when CONFIG_OF is disabled, which should result in the same behavior as before.

---
 drivers/regulator/core.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

index d68244ad9423..e685f8b94acf 100644
@@ -4345,6 +4345,9 @@ static int regulator_register_fill_coupling_array(struct device *dev,
 {
 	struct regulator_dev *rdev = dev_to_rdev(dev);
 
+	if (!IS_ENABLED(CONFIG_OF))
+		return 0;
+
 	if (regulator_fill_coupling_array(rdev))
 		rdev_dbg(rdev, "unable to resolve coupling\n");
 

@@ -4353,7 +4356,12 @@ static int regulator_register_fill_coupling_array(struct device *dev,
 
 static int regulator_resolve_coupling(struct regulator_dev *rdev)
 {
-	int n_phandles = of_get_n_coupled(rdev);
+	int n_phandles;
+
+	if (!IS_ENABLED(CONFIG_OF))
+		return 0;
+
+	n_phandles = of_get_n_coupled(rdev);
 
 	if (n_phandles + 1 > MAX_COUPLED) {
 		rdev_err(rdev, "too many regulators coupled\n");

2.16.2