Skip to contentSkip to conversation

regulator: Add empty devm_regulator_bulk_get for !CONFIG_REGULATOR

PATCH In review Axel Lin 2 participants 2 messages Jan 27, 2012 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: Add empty devm_regulator_bulk_get for !CONFIG_REGULATOR

This fixes below build error if CONFIG_REGULATOR is disabled.

CC sound/soc/codecs/wm5100.o
sound/soc/codecs/wm5100.c: In function ‘wm5100_i2c_probe’:
sound/soc/codecs/wm5100.c:2462: error: implicit declaration of function ‘devm_regulator_bulk_get’ make[3]: *** [sound/soc/codecs/wm5100.o] Error 1
make[2]: *** [sound/soc/codecs] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2

---
 include/linux/regulator/consumer.h |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
include/linux/regulator/consumer.h +6 -0
index 35c4283..cef8f04 100644
@@ -249,6 +249,12 @@ static inline int regulator_bulk_get(struct device *dev,
 	return 0;
 }
 
+static inline int devm_regulator_bulk_get(struct device *dev, int num_consumers,
+					  struct regulator_bulk_data *consumers)
+{
+	return 0;
+}
+
 static inline int regulator_bulk_enable(int num_consumers,
 					struct regulator_bulk_data *consumers)
 {
Signature · 1 line
1.7.5.4
#1 lore raw
Quoted 1 line · Axel Lin

This fixes below build error if CONFIG_REGULATOR is disabled.

Weird, I somehow managed to avoid checking that in to the commit though it's in my tree. Anyway, applied - thanks.