Merge tag 'regulator-fix-v6.11-stub' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

torvalds · torvalds · commit 2a66044754a7 · 2024-09-05T16:41:16.000-07:00
Pull regulator fix from Mark Brown:
 "A fix from Doug Anderson for a missing stub, required to fix the build
  for some newly added users of devm_regulator_bulk_get_const() in
  !REGULATOR configurations"

* tag 'regulator-fix-v6.11-stub' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: Stub devm_regulator_bulk_get_const() if !CONFIG_REGULATOR
diff --git a/include/linux/regulator/consumer.h b/include/linux/regulator/consumer.h
@@ -452,6 +452,14 @@ static inline int of_regulator_bulk_get_all(struct device *dev, struct device_no
 	return 0;
 }
 
+static inline int devm_regulator_bulk_get_const(
+	struct device *dev, int num_consumers,
+	const struct regulator_bulk_data *in_consumers,
+	struct regulator_bulk_data **out_consumers)
+{
+	return 0;
+}
+
 static inline int regulator_bulk_enable(int num_consumers,
 					struct regulator_bulk_data *consumers)
 {

Original file line number	Diff line number	Diff line change
`@@ -452,6 +452,14 @@ static inline int of_regulator_bulk_get_all(struct device *dev, struct device_no`
`452`	`452`	`return 0;`
`453`	`453`	`}`
`454`	`454`
	`455`	`+static inline int devm_regulator_bulk_get_const(`
	`456`	`+ struct device *dev, int num_consumers,`
	`457`	`+ const struct regulator_bulk_data *in_consumers,`
	`458`	`+ struct regulator_bulk_data **out_consumers)`
	`459`	`+{`
	`460`	`+ return 0;`
	`461`	`+}`
	`462`	`+`
`455`	`463`	`static inline int regulator_bulk_enable(int num_consumers,`
`456`	`464`	`struct regulator_bulk_data *consumers)`
`457`	`465`	`{`