Skip to contentSkip to conversation

regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT

PATCH In review Axel Lin 3 participants 5 messages Apr 2, 2013 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT

Fix below build errors:

LD arch/arm/mach-ux500/built-in.o
arch/arm/mach-ux500/board-mop500-regulators.o: In function `ab8500_ext_regulator_init':
include/linux/regulator/ab8500.h:331: multiple definition of `ab8500_ext_regulator_init' arch/arm/mach-ux500/board-mop500.o:/home/axel/repos/git/regulator/include/linux/regulator/ab8500.h:331: first defined here arch/arm/mach-ux500/board-mop500-regulators.o: In function `ab8500_ext_regulator_exit':
include/linux/regulator/ab8500.h:335: multiple definition of `ab8500_ext_regulator_exit' arch/arm/mach-ux500/board-mop500.o:/home/axel/repos/git/regulator/include/linux/regulator/ab8500.h:335: first defined here make[1]: *** [arch/arm/mach-ux500/built-in.o] Error 1
make: *** [arch/arm/mach-ux500] Error 2

---
 include/linux/regulator/ab8500.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/regulator/ab8500.h +2 -2
index bb0140c..1790059 100644
@@ -325,11 +325,11 @@ struct ab8500_regulator_platform_data {
 int ab8500_ext_regulator_init(struct platform_device *pdev);
 int ab8500_ext_regulator_exit(struct platform_device *pdev);
 #else
-inline int ab8500_ext_regulator_init(struct platform_device *pdev)
+static inline int ab8500_ext_regulator_init(struct platform_device *pdev)
 {
 	return 0;
 }
-inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
+static inline int ab8500_ext_regulator_exit(struct platform_device *pdev)
 {
 	return 0;
 }
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 4 lines · Axel Lin

Fix below build errors:

LD arch/arm/mach-ux500/built-in.o
arch/arm/mach-ux500/board-mop500-regulators.o: In function `ab8500_ext_regulator_init':

Lee?

#2 lore raw
Quoted 7 lines · Mark Brown
Quoted 4 lines · Axel Lin

Fix below build errors:

LD arch/arm/mach-ux500/built-in.o
arch/arm/mach-ux500/board-mop500-regulators.o: In function `ab8500_ext_regulator_init':

Lee?

Better if you can send me the whole patch.

We're not paying by the Byte anymore. :)

I'll look into it.

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw
Quoted 5 lines · Lee Jones
Quoted 1 line · Mark Brown

Lee?

Better if you can send me the whole patch.

You were on the CC for the original posting of this and the other one you didn't reply to (both sent today) but ignored them for some reason.

#4 lore raw
In reply to Mark Brown
Quoted 7 lines · Mark Brown
Quoted 4 lines · Axel Lin

Fix below build errors:

LD arch/arm/mach-ux500/built-in.o
arch/arm/mach-ux500/board-mop500-regulators.o: In function `ab8500_ext_regulator_init':

Lee?

Ah yes, I see what's happened.

CONFIG_REGULATOR_AB8500_EXT was used to conditionally build the AB8500 External Regulator driver, but now we just 'build it anyway' on Mark's request. However, the guards are still remaining in some places.

Please don't action this patch. I'll fix it up properly by removing the surplus guards.

Signature · 4 lines
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog