* [PATCH] Fix s3c24xx build error if !CONFIG_PM
@ 2011-10-18 10:52 Domenico Andreoli
2011-10-21 9:37 ` Kukjin Kim
0 siblings, 1 reply; 4+ messages in thread
From: Domenico Andreoli @ 2011-10-18 10:52 UTC (permalink / raw)
To: linux-arm-kernel
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
This patch fixes all of them.
Signed-off-by: Domenico Andreoli <cavokz@gmail.com>
---
arch/arm/mach-s3c2410/s3c2410.c | 2 ++
arch/arm/mach-s3c2440/s3c2440.c | 2 ++
arch/arm/mach-s3c2440/s3c2442.c | 2 ++
3 files changed, 6 insertions(+)
Index: b/arch/arm/mach-s3c2410/s3c2410.c
===================================================================
--- a/arch/arm/mach-s3c2410/s3c2410.c
+++ b/arch/arm/mach-s3c2410/s3c2410.c
@@ -170,8 +170,10 @@ int __init s3c2410_init(void)
{
printk("S3C2410: Initialising architecture\n");
+#ifdef CONFIG_PM
register_syscore_ops(&s3c2410_pm_syscore_ops);
register_syscore_ops(&s3c24xx_irq_syscore_ops);
+#endif
return sysdev_register(&s3c2410_sysdev);
}
Index: b/arch/arm/mach-s3c2440/s3c2440.c
===================================================================
--- a/arch/arm/mach-s3c2440/s3c2440.c
+++ b/arch/arm/mach-s3c2440/s3c2440.c
@@ -55,9 +55,11 @@ int __init s3c2440_init(void)
/* register suspend/resume handlers */
+#ifdef CONFIG_PM
register_syscore_ops(&s3c2410_pm_syscore_ops);
register_syscore_ops(&s3c244x_pm_syscore_ops);
register_syscore_ops(&s3c24xx_irq_syscore_ops);
+#endif
/* register our system device for everything else */
Index: b/arch/arm/mach-s3c2440/s3c2442.c
===================================================================
--- a/arch/arm/mach-s3c2440/s3c2442.c
+++ b/arch/arm/mach-s3c2440/s3c2442.c
@@ -169,9 +169,11 @@ int __init s3c2442_init(void)
{
printk("S3C2442: Initialising architecture\n");
+#ifdef CONFIG_PM
register_syscore_ops(&s3c2410_pm_syscore_ops);
register_syscore_ops(&s3c244x_pm_syscore_ops);
register_syscore_ops(&s3c24xx_irq_syscore_ops);
+#endif
return sysdev_register(&s3c2442_sysdev);
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Fix s3c24xx build error if !CONFIG_PM
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
0 siblings, 1 reply; 4+ messages in thread
From: Kukjin Kim @ 2011-10-21 9:37 UTC (permalink / raw)
To: linux-arm-kernel
Domenico Andreoli wrote:
>
> 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
>
> This patch fixes all of them.
>
> Signed-off-by: Domenico Andreoli <cavokz@gmail.com>
>
> ---
> arch/arm/mach-s3c2410/s3c2410.c | 2 ++
> arch/arm/mach-s3c2440/s3c2440.c | 2 ++
> arch/arm/mach-s3c2440/s3c2442.c | 2 ++
> 3 files changed, 6 insertions(+)
>
> Index: b/arch/arm/mach-s3c2410/s3c2410.c
> =============================================================
> ======
> --- a/arch/arm/mach-s3c2410/s3c2410.c
> +++ b/arch/arm/mach-s3c2410/s3c2410.c
> @@ -170,8 +170,10 @@ int __init s3c2410_init(void)
> {
> printk("S3C2410: Initialising architecture\n");
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2410_pm_syscore_ops);
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
I think, basically we don't need condition for "s3c24xx_irq_syscore_ops",
since it will be built without CONFIG_PM.
> +#endif
>
> return sysdev_register(&s3c2410_sysdev);
> }
> Index: b/arch/arm/mach-s3c2440/s3c2440.c
> =============================================================
> ======
> --- a/arch/arm/mach-s3c2440/s3c2440.c
> +++ b/arch/arm/mach-s3c2440/s3c2440.c
> @@ -55,9 +55,11 @@ int __init s3c2440_init(void)
>
> /* register suspend/resume handlers */
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2410_pm_syscore_ops);
> register_syscore_ops(&s3c244x_pm_syscore_ops);
Same as above.
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
Same as above.
> +#endif
>
> /* register our system device for everything else */
>
> Index: b/arch/arm/mach-s3c2440/s3c2442.c
> =============================================================
> ======
> --- a/arch/arm/mach-s3c2440/s3c2442.c
> +++ b/arch/arm/mach-s3c2440/s3c2442.c
> @@ -169,9 +169,11 @@ int __init s3c2442_init(void)
> {
> printk("S3C2442: Initialising architecture\n");
>
> +#ifdef CONFIG_PM
> register_syscore_ops(&s3c2410_pm_syscore_ops);
> register_syscore_ops(&s3c244x_pm_syscore_ops);
Same as above.
> register_syscore_ops(&s3c24xx_irq_syscore_ops);
Same as above.
> +#endif
>
> return sysdev_register(&s3c2442_sysdev);
> }
Err...happend following build error without CONFIG_PM on 3.1-rc10.
arch/arm/mach-s3c2410/built-in.o: In function `s3c2410_init':
arch/arm/mach-s3c2410/s3c2410.c:177: undefined reference to
`s3c2410_pm_syscore_ops'
arch/arm/mach-s3c2412/built-in.o: In function `s3c2412_init':
arch/arm/mach-s3c2412/s3c2412.c:252: undefined reference to
`s3c2412_pm_syscore_ops'
arch/arm/mach-s3c2416/built-in.o: In function `s3c2416_init':
arch/arm/mach-s3c2416/s3c2416.c:104: undefined reference to
`s3c2416_pm_syscore_ops'
arch/arm/mach-s3c2440/built-in.o: In function `s3c2440_init':
arch/arm/mach-s3c2440/s3c2440.c:65: undefined reference to
`s3c2410_pm_syscore_ops'
arch/arm/mach-s3c2440/built-in.o: In function `s3c2442_init':
arch/arm/mach-s3c2440/s3c2442.c:177: undefined reference to
`s3c2410_pm_syscore_ops'
So this should be following?
diff --git a/arch/arm/mach-s3c2410/s3c2410.c
b/arch/arm/mach-s3c2410/s3c2410.c
index f1d3bd8..343a540 100644
--- 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);
diff --git a/arch/arm/mach-s3c2412/s3c2412.c
b/arch/arm/mach-s3c2412/s3c2412.c
index ef0958d..57a1e01 100644
--- 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);
diff --git a/arch/arm/mach-s3c2416/s3c2416.c
b/arch/arm/mach-s3c2416/s3c2416.c
index 494ce91..20b3fdf 100644
--- 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);
diff --git a/arch/arm/mach-s3c2440/s3c2440.c
b/arch/arm/mach-s3c2440/s3c2440.c
index ce99ff7..2270d33 100644
--- 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);
diff --git a/arch/arm/mach-s3c2440/s3c2442.c
b/arch/arm/mach-s3c2440/s3c2442.c
index 9ad99f8..6f2b65e 100644
--- 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);
However, hmm....I think, we need to sort out regarding s3c24xx PM codes'
structure.
Anyway, Domenico, if you're ok with above, could you please re-submit?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2] Fix s3c24xx build errors if !CONFIG_PM
2011-10-21 9:37 ` Kukjin Kim
@ 2011-10-21 13:50 ` Domenico Andreoli
2011-10-21 19:46 ` Kukjin Kim
0 siblings, 1 reply; 4+ messages in thread
From: Domenico Andreoli @ 2011-10-21 13:50 UTC (permalink / raw)
To: linux-arm-kernel
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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] Fix s3c24xx build errors if !CONFIG_PM
2011-10-21 13:50 ` [PATCH v2] Fix s3c24xx build errors " Domenico Andreoli
@ 2011-10-21 19:46 ` Kukjin Kim
0 siblings, 0 replies; 4+ messages in thread
From: Kukjin Kim @ 2011-10-21 19:46 UTC (permalink / raw)
To: linux-arm-kernel
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-21 19:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).