From: nicolas.ferre@atmel.com (Nicolas Ferre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/11] ARM: at91: fix pm declarations
Date: Fri, 13 Feb 2015 09:37:05 +0100 [thread overview]
Message-ID: <54DDB7B1.2020800@atmel.com> (raw)
In-Reply-To: <1423770163-583064-7-git-send-email-arnd@arndb.de>
Le 12/02/2015 20:42, Arnd Bergmann a ?crit :
> In a recent rearrangement of the at91 pm initialization code, a broken
> set of declarations was added for the !CONFIG_PM-case, leading to
> this link error:
>
> arch/arm/mach-at91/board-dt-sama5.o: In function `at91_rm9200_pm_init':
> arch/arm/mach-at91/generic.h:40: multiple definition of `at91_rm9200_pm_init'
> arch/arm/mach-at91/setup.o:arch/arm/mach-at91/generic.h:40: first defined here
> arch/arm/mach-at91/board-dt-sama5.o: In function `at91_sam9260_pm_init':
> arch/arm/mach-at91/generic.h:41: multiple definition of `at91_sam9260_pm_init'
> arch/arm/mach-at91/setup.o:arch/arm/mach-at91/generic.h:41: first defined here
> arch/arm/mach-at91/board-dt-sama5.o: In function `at91_sam9g45_pm_init':
> arch/arm/mach-at91/generic.h:42: multiple definition of `at91_sam9g45_pm_init'
> arch/arm/mach-at91/setup.o:arch/arm/mach-at91/generic.h:42: first defined here
>
> This adds the missing 'static inline' to the declarations to avoid
> creating a copy of the functions in each file that includes the
> header.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 4db0ba22da9 ("ARM: at91: pm: prepare for multiplatform")
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Yes:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Thanks Arnd. Bye,
> Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> arch/arm/mach-at91/generic.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
> index a6e726a6e0b5..583369ffc284 100644
> --- a/arch/arm/mach-at91/generic.h
> +++ b/arch/arm/mach-at91/generic.h
> @@ -35,10 +35,10 @@ extern void __init at91sam9260_pm_init(void);
> extern void __init at91sam9g45_pm_init(void);
> extern void __init at91sam9x5_pm_init(void);
> #else
> -void __init at91rm9200_pm_init(void) { }
> -void __init at91sam9260_pm_init(void) { }
> -void __init at91sam9g45_pm_init(void) { }
> -void __init at91sam9x5_pm_init(void) { }
> +static inline void __init at91rm9200_pm_init(void) { }
> +static inline void __init at91sam9260_pm_init(void) { }
> +static inline void __init at91sam9g45_pm_init(void) { }
> +static inline void __init at91sam9x5_pm_init(void) { }
> #endif
>
> #endif /* _AT91_GENERIC_H */
>
--
Nicolas Ferre
next prev parent reply other threads:[~2015-02-13 8:37 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-12 19:42 [PATCH 00/11] ARM: random randconfig fixes, soc specific Arnd Bergmann
2015-02-12 19:42 ` [PATCH 01/11] ARM: vexpress: use ARM_CPU_SUSPEND if needed Arnd Bergmann
2015-02-13 1:31 ` Nicolas Pitre
2015-02-13 10:37 ` Liviu Dudau
2015-02-13 10:57 ` Russell King - ARM Linux
2015-02-13 11:01 ` Liviu Dudau
2015-02-13 11:16 ` Russell King - ARM Linux
2015-02-13 11:22 ` Liviu Dudau
2015-02-13 23:03 ` Nicolas Pitre
2015-02-13 22:55 ` Nicolas Pitre
2015-02-14 1:34 ` Liviu Dudau
2015-02-14 20:42 ` Lorenzo Pieralisi
2015-02-12 19:42 ` [PATCH 02/11] ARM: sunxi: always select RESET_CONTROLLER Arnd Bergmann
2015-02-13 9:09 ` Maxime Ripard
2015-02-16 20:47 ` Arnd Bergmann
2015-02-12 19:42 ` [PATCH 03/11] ARM: BCM: put back ARCH_MULTI_V7 dependency for mobile Arnd Bergmann
2015-02-12 20:02 ` Florian Fainelli
2015-02-12 20:08 ` arnd at arndb.de
2015-02-12 21:57 ` Florian Fainelli
2015-02-12 22:07 ` Scott Branden
2015-02-12 19:42 ` [PATCH 04/11] ARM: davinci: davinci_cfg_reg cannot be init Arnd Bergmann
2015-02-16 15:37 ` Sekhar Nori
2015-02-12 19:42 ` [PATCH 05/11] ARM: davinci: multi-soc kernels require AUTO_ZRELADDR Arnd Bergmann
2015-02-16 15:50 ` Sekhar Nori
2015-02-12 19:42 ` [PATCH 06/11] ARM: at91: fix pm declarations Arnd Bergmann
2015-02-13 8:37 ` Nicolas Ferre [this message]
2015-02-12 19:42 ` [PATCH 07/11] ARM: prima2: do not select SMP_ON_UP Arnd Bergmann
2015-02-13 3:05 ` Barry Song
2015-02-12 19:42 ` [PATCH 08/11] ARM: ixp4xx: fix {in,out}s{bwl} data types Arnd Bergmann
2015-02-16 14:16 ` Krzysztof Hałasa
2015-02-12 19:42 ` [PATCH 09/11] ARM: rockchip: make rockchip_suspend_init conditional Arnd Bergmann
2015-02-13 19:26 ` Heiko Stübner
2015-02-12 19:42 ` [PATCH 10/11] ARM: sti: always enable RESET_CONTROLLER Arnd Bergmann
2015-02-13 7:28 ` Patrice Chotard
2015-02-13 8:09 ` Maxime Coquelin
2015-02-12 19:42 ` [PATCH 11/11] ARM: mvebu: build armada375-smp code conditionally Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54DDB7B1.2020800@atmel.com \
--to=nicolas.ferre@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).