From: kgene.kim@samsung•com (Kukjin Kim)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2] Fix s3c24xx build errors if !CONFIG_PM
Date: Sat, 22 Oct 2011 04:46:10 +0900 [thread overview]
Message-ID: <4EA1CC02.3080201@samsung.com> (raw)
In-Reply-To: <20111021135023.GA30167@glitch>
On 10/21/11 22:50, Domenico Andreoli wrote:
> From: Domenico Andreoli<cavokz@gmail•com>
>
> v2:
> - register_syscore_ops(&s3c24xx_irq_syscore_ops) does not need to be
> conditionally compiled out, it is already optimized out on !CONFIG_PM
> - fix also s3c2412 and s3c2416 affected by the same build issue
>
> v1:
> s3c2440.c fails to build if !CONFIG_PM because in such case
> s3c2410_pm_syscore_ops is not defined. Same error should happen also
> in s3c2410.c and s3c2442.c
>
> Signed-off-by: Domenico Andreoli<cavokz@gmail•com>
>
> ---
> arch/arm/mach-s3c2410/s3c2410.c | 2 ++
> arch/arm/mach-s3c2412/s3c2412.c | 2 ++
> arch/arm/mach-s3c2416/s3c2416.c | 2 ++
> arch/arm/mach-s3c2440/s3c2440.c | 2 ++
> arch/arm/mach-s3c2440/s3c2442.c | 2 ++
> 5 files changed, 10 insertions(+)
>
> Index: b/arch/arm/mach-s3c2410/s3c2410.c
> ===================================================================
> --- a/arch/arm/mach-s3c2410/s3c2410.c
> +++ b/arch/arm/mach-s3c2410/s3c2410.c
> @@ -170,7 +170,9 @@ int __init s3c2410_init(void)
> {
> printk("S3C2410: Initialising architecture\n");
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2410_pm_syscore_ops);
> +#endif
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
>
> return sysdev_register(&s3c2410_sysdev);
> Index: b/arch/arm/mach-s3c2412/s3c2412.c
> ===================================================================
> --- a/arch/arm/mach-s3c2412/s3c2412.c
> +++ b/arch/arm/mach-s3c2412/s3c2412.c
> @@ -245,7 +245,9 @@ int __init s3c2412_init(void)
> {
> printk("S3C2412: Initialising architecture\n");
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2412_pm_syscore_ops);
> +#endif
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
>
> return sysdev_register(&s3c2412_sysdev);
> Index: b/arch/arm/mach-s3c2416/s3c2416.c
> ===================================================================
> --- a/arch/arm/mach-s3c2416/s3c2416.c
> +++ b/arch/arm/mach-s3c2416/s3c2416.c
> @@ -97,7 +97,9 @@ int __init s3c2416_init(void)
>
> s3c_fb_setname("s3c2443-fb");
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2416_pm_syscore_ops);
> +#endif
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
>
> return sysdev_register(&s3c2416_sysdev);
> Index: b/arch/arm/mach-s3c2440/s3c2440.c
> ===================================================================
> --- a/arch/arm/mach-s3c2440/s3c2440.c
> +++ b/arch/arm/mach-s3c2440/s3c2440.c
> @@ -55,7 +55,9 @@ int __init s3c2440_init(void)
>
> /* register suspend/resume handlers */
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2410_pm_syscore_ops);
> +#endif
> register_syscore_ops(&s3c244x_pm_syscore_ops);
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
>
> Index: b/arch/arm/mach-s3c2440/s3c2442.c
> ===================================================================
> --- a/arch/arm/mach-s3c2440/s3c2442.c
> +++ b/arch/arm/mach-s3c2440/s3c2442.c
> @@ -169,7 +169,9 @@ int __init s3c2442_init(void)
> {
> printk("S3C2442: Initialising architecture\n");
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2410_pm_syscore_ops);
> +#endif
> register_syscore_ops(&s3c244x_pm_syscore_ops);
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
>
> --
Looks good to me, applied.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung•com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
prev parent reply other threads:[~2011-10-21 19:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-18 10:52 [PATCH] Fix s3c24xx build error if !CONFIG_PM Domenico Andreoli
2011-10-21 9:37 ` Kukjin Kim
2011-10-21 13:50 ` [PATCH v2] Fix s3c24xx build errors " Domenico Andreoli
2011-10-21 19:46 ` Kukjin Kim [this message]
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=4EA1CC02.3080201@samsung.com \
--to=kgene.kim@samsung$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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