* [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT
@ 2013-04-02 0:20 Axel Lin
2013-04-02 11:27 ` Mark Brown
0 siblings, 1 reply; 5+ messages in thread
From: Axel Lin @ 2013-04-02 0:20 UTC (permalink / raw)
To: Mark Brown
Cc: Bengt Jonsson, Lee Jones, Yvan FILLION, Liam Girdwood,
linux-kernel
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
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
include/linux/regulator/ab8500.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index bb0140c..1790059 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -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;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT
2013-04-02 0:20 [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT Axel Lin
@ 2013-04-02 11:27 ` Mark Brown
2013-04-02 11:45 ` Lee Jones
2013-04-02 12:05 ` Lee Jones
0 siblings, 2 replies; 5+ messages in thread
From: Mark Brown @ 2013-04-02 11:27 UTC (permalink / raw)
To: Axel Lin
Cc: Bengt Jonsson, Lee Jones, Yvan FILLION, Liam Girdwood,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
On Tue, Apr 02, 2013 at 08:20:38AM +0800, Axel Lin wrote:
> 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?
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT
2013-04-02 11:27 ` Mark Brown
@ 2013-04-02 11:45 ` Lee Jones
2013-04-02 11:51 ` Mark Brown
2013-04-02 12:05 ` Lee Jones
1 sibling, 1 reply; 5+ messages in thread
From: Lee Jones @ 2013-04-02 11:45 UTC (permalink / raw)
To: Mark Brown
Cc: Axel Lin, Bengt Jonsson, Yvan FILLION, Liam Girdwood,
linux-kernel
On Tue, 02 Apr 2013, Mark Brown wrote:
> On Tue, Apr 02, 2013 at 08:20:38AM +0800, Axel Lin wrote:
> > 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.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT
2013-04-02 11:45 ` Lee Jones
@ 2013-04-02 11:51 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2013-04-02 11:51 UTC (permalink / raw)
To: Lee Jones
Cc: Axel Lin, Bengt Jonsson, Yvan FILLION, Liam Girdwood,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 299 bytes --]
On Tue, Apr 02, 2013 at 12:45:49PM +0100, Lee Jones wrote:
> On Tue, 02 Apr 2013, Mark Brown wrote:
> > 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.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT
2013-04-02 11:27 ` Mark Brown
2013-04-02 11:45 ` Lee Jones
@ 2013-04-02 12:05 ` Lee Jones
1 sibling, 0 replies; 5+ messages in thread
From: Lee Jones @ 2013-04-02 12:05 UTC (permalink / raw)
To: Mark Brown
Cc: Axel Lin, Bengt Jonsson, Yvan FILLION, Liam Girdwood,
linux-kernel
On Tue, 02 Apr 2013, Mark Brown wrote:
> On Tue, Apr 02, 2013 at 08:20:38AM +0800, Axel Lin wrote:
> > 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.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-04-02 12:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-02 0:20 [PATCH] regulator: ab8500: Staticize ab8500_ext_regulator_[init|exit] if !CONFIG_REGULATOR_AB8500_EXT Axel Lin
2013-04-02 11:27 ` Mark Brown
2013-04-02 11:45 ` Lee Jones
2013-04-02 11:51 ` Mark Brown
2013-04-02 12:05 ` Lee Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox