arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue

PATCH New Chen Gang 2 participants 7 messages Jan 7, 2013 – Jan 18, 2013 1 message not in the archive

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Chen Gang

author

2013-01-07 09:35 UTC #0 lore raw

PATCH 1/1 arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue

if not define CONFIG_CPU_S5PV210

it will define NULL in common.h for:
s5pv210_map_io, s5pv210_init_clocks, s5pv210_init, s5pv210_init_uarts

so need using #ifdef CONFIG_CPU_S5PV210 for them too, in common.c.
or compiling issue will occur.

Signed-off-by Chen Gang <[email protected]>

---
 arch/arm/mach-s5pv210/common.c |    9 +++++++++
 1 file changed, 9 insertions(+)

arch/arm/mach-s5pv210/common.c +9 -0

index 9dfe93e..ad56485 100644
@@ -167,6 +167,8 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
 	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 }
 
+#ifdef CONFIG_CPU_S5PV210
+
 void __init s5pv210_map_io(void)
 {
 	/* initialise device information early */

@@ -209,6 +211,9 @@ void __init s5pv210_init_clocks(int xtal)
 	s5pv210_setup_clocks();
 }
 
+#endif /* CONFIG_CPU_S5PV210 */
+
+
 void __init s5pv210_init_irq(void)
 {
 	u32 vic[4];	/* S5PV210 supports 4 VIC */

@@ -222,6 +227,8 @@ void __init s5pv210_init_irq(void)
 	s5p_init_irq(vic, ARRAY_SIZE(vic));
 }
 
+#ifdef CONFIG_CPU_S5PV210
+
 struct bus_type s5pv210_subsys = {
 	.name		= "s5pv210-core",
 	.dev_name	= "s5pv210-core",

@@ -249,3 +256,5 @@ void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
 	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
 }
+
+#endif /* CONFIG_CPU_S5PV210 */

Signature · 1 line

1.7.10.4

Chen Gang

author

2013-01-07 12:01 UTC #1 lore raw

PATCH 1/1 arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue

arch/arm/mach-s5pv210/common.c void __init s5pv210_init_irq(void) · line 234

Quoted 7 lines · Chen Gang

arch/arm/mach-s5pv210/common.c +2 -0

+#ifdef CONFIG_CPU_S5PV210
+
 struct bus_type s5pv210_subsys = {
 	.name		= "s5pv210-core",
 	.dev_name	= "s5pv210-core",

sorry, it is my fault.
should let s5pv210_subsys outside of #ifdef CONFIG_CPU_S5PV210. it is used in pm.c

I need send patch v2.

Signature · 3 lines

Chen Gang

Asianux Corporation

Chen Gang

author

2013-01-07 12:30 UTC #2 lore raw

PATCH v2 1/1 arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue

In reply to Chen Gang

if not define CONFIG_CPU_S5PV210

it will define NULL in common.h for:
s5pv210_map_io, s5pv210_init_clocks, s5pv210_init, s5pv210_init_uarts

so need using #ifdef CONFIG_CPU_S5PV210 for them too, in common.c.
or compiling issue will occur.

Signed-off-by Chen Gang <[email protected]>

---
 arch/arm/mach-s5pv210/common.c |    9 +++++++++
 1 file changed, 9 insertions(+)

arch/arm/mach-s5pv210/common.c +9 -0

index 9dfe93e..5c88f88 100644
@@ -167,6 +167,8 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
 	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 }
 
+#ifdef CONFIG_CPU_S5PV210
+
 void __init s5pv210_map_io(void)
 {
 	/* initialise device information early */

@@ -209,6 +211,9 @@ void __init s5pv210_init_clocks(int xtal)
 	s5pv210_setup_clocks();
 }
 
+#endif /* CONFIG_CPU_S5PV210 */
+
+
 void __init s5pv210_init_irq(void)
 {
 	u32 vic[4];	/* S5PV210 supports 4 VIC */

@@ -227,6 +232,8 @@ struct bus_type s5pv210_subsys = {
 	.dev_name	= "s5pv210-core",
 };
 
+#ifdef CONFIG_CPU_S5PV210
+
 static struct device s5pv210_dev = {
 	.bus	= &s5pv210_subsys,
 };

@@ -249,3 +256,5 @@ void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
 	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
 }
+
+#endif /* CONFIG_CPU_S5PV210 */

Signature · 1 line

1.7.10.4

Chen Gang

author

2013-01-15 10:02 UTC #3 lore raw

PATCH v2 1/1 arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue

Hello kgene.kim

when you have free time, please give a glance for this patch.

I sent it according to script/get_maintainter.pl. if I sent to an incorrect member, please tell me, thanks.

Regards

gchen.

Quoted 54 lines · Chen Gang

if not define CONFIG_CPU_S5PV210

it will define NULL in common.h for:
s5pv210_map_io, s5pv210_init_clocks, s5pv210_init, s5pv210_init_uarts

so need using #ifdef CONFIG_CPU_S5PV210 for them too, in common.c.
or compiling issue will occur.

Signed-off-by Chen Gang <[email protected]>

---
 arch/arm/mach-s5pv210/common.c |    9 +++++++++
 1 file changed, 9 insertions(+)

arch/arm/mach-s5pv210/common.c +9 -0

index 9dfe93e..5c88f88 100644
@@ -167,6 +167,8 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
 	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 }
 
+#ifdef CONFIG_CPU_S5PV210
+
 void __init s5pv210_map_io(void)
 {
 	/* initialise device information early */

@@ -209,6 +211,9 @@ void __init s5pv210_init_clocks(int xtal)
 	s5pv210_setup_clocks();
 }
 
+#endif /* CONFIG_CPU_S5PV210 */
+
+
 void __init s5pv210_init_irq(void)
 {
 	u32 vic[4];	/* S5PV210 supports 4 VIC */

@@ -227,6 +232,8 @@ struct bus_type s5pv210_subsys = {
 	.dev_name	= "s5pv210-core",
 };
 
+#ifdef CONFIG_CPU_S5PV210
+
 static struct device s5pv210_dev = {
 	.bus	= &s5pv210_subsys,
 };

@@ -249,3 +256,5 @@ void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 {
 	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
 }
+
+#endif /* CONFIG_CPU_S5PV210 */

Signature · 3 lines

Chen Gang

Asianux Corporation

Kukjin Kim

2013-01-18 00:14 UTC #4 lore raw

PATCH v2 1/1 arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue

In reply to Chen Gang

Quoted 1 line · Chen Gang

Firstly, thanks for your posting.

But there are some comments.

For subject:
Please see the git log before your commit, it should be helpful to you. In this case, 'ARM: S5PV210: ...' is used.

Quoted 5 lines

if not define CONFIG_CPU_S5PV210
it will define NULL in common.h for:
s5pv210_map_io, s5pv210_init_clocks, s5pv210_init,

s5pv210_init_uarts

Quoted 4 lines

so need using #ifdef CONFIG_CPU_S5PV210 for them too, in common.c.
or compiling issue will occur.

I don't think so, because common.c in mach-s5pv210 should be built with selecting CONFIG_CPU_S5PV210, actually it depends on CONFIG_ARCH_S5PV210 though.

Any concerns, please let me know.

Quoted 22 lines

Signed-off-by Chen Gang <[email protected]>
---
 arch/arm/mach-s5pv210/common.c |    9 +++++++++
 1 file changed, 9 insertions(+)
arch/arm/mach- renamed from arch/arm/mach-s5pv210/common.c +0 -0
s5pv210/common.c
index 9dfe93e..5c88f88 100644
arch/arm/mach-s5pv210/common.c +2 -0
@@ -167,6 +167,8 @@ void __init s5pv210_init_io(struct map_desc
 *mach_desc, int size)
 	s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
 }
 
+#ifdef CONFIG_CPU_S5PV210
+
 void __init s5pv210_map_io(void)
 {
arch/arm/mach-s5pv210/common.c +0 -0
 	/* initialise device information early */

arch/arm/mach-s5pv210/common.c void __init s5pv210_init_clocks(int xtal) · line 216

Quoted 6 lines

arch/arm/mach-s5pv210/common.c +3 -0

@@ -209,6 +211,9 @@ void __init s5pv210_init_clocks(int xtal)
 	s5pv210_setup_clocks();
 }
 
+#endif /* CONFIG_CPU_S5PV210 */
+
+

Generally, no need double empty lines here.

Quoted 20 lines

arch/arm/mach-s5pv210/common.c +4 -1

 void __init s5pv210_init_irq(void)
 {
 	u32 vic[4];	/* S5PV210 supports 4 VIC */

@@ -227,6 +232,8 @@ struct bus_type s5pv210_subsys = {
 	.dev_name	= "s5pv210-core",
 };
 
+#ifdef CONFIG_CPU_S5PV210
+
 static struct device s5pv210_dev = {
 	.bus	= &s5pv210_subsys,
 };

@@ -249,3 +256,5 @@ void __init s5pv210_init_uarts(struct s3c2410_uartcfg
 *cfg, int no)
 {
 	s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
 }
+
+#endif /* CONFIG_CPU_S5PV210 */
--

Quoted 1 line

1.7.10.4

Thanks.

- Kukjin

A message that is not in the archive (sent off-list or not yet received): [email protected]

Kukjin Kim

2013-01-18 03:33 UTC #6 lore raw

PATCH v2 1/1 arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210to fix compiling issue

Quoted 6 lines · Chen,Gang( ??)

Quoted 5 lines
For subject:
Please see the git log before your commit, it should be helpful to you. In this case, 'ARM: S5PV210: ...' is used.

Quoted 6 lines

thank you, I should notice it next time.
an incorrect subject is not easy to get maintainer's notice
maybe it is the reason why you can not reply in time, since you can not notice it.
:-)

Just I was busy ;-) sorry for late my reply.

Anyway Gang, don't post with html typed e-mail, probably, you got some kind of error that your previous reply wasn't accepted from mailing list mail server. Please make sure that your e-mail is plain text type for mailing list.

[...]

Quoted 11 lines

Quoted 5 lines
I don't think so, because common.c in mach-s5pv210 should be built with selecting CONFIG_CPU_S5PV210, actually it depends on CONFIG_ARCH_S5PV210 though.
Any concerns, please let me know.
ok, thank you.
and
is it suitable to delete the reletive code of " define NULL in common.h for s5pv210_* " ? it seems they are wast.

Yes, right. We don't need more that. I missed it when I introduced common.[ch] local at the commit 3fa754c2. Thanks for pointing out and I will sort out.

[...]

Thanks.

- Kukjin

Chen Gang

author

2013-01-18 05:45 UTC #7 lore raw

PATCH v2 1/1 arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210to fix compiling issue

Quoted 9 lines · Kukjin Kim

Quoted 6 lines · Chen,Gang( ??)
thank you, I should notice it next time.
an incorrect subject is not easy to get maintainer's notice
maybe it is the reason why you can not reply in time, since you can not notice it.
:-)
Just I was busy ;-) sorry for late my reply.

not mind, most of us are often busy, I will have more patience, next time.

Quoted 3 lines

Anyway Gang, don't post with html typed e-mail, probably, you got some kind of error that your previous reply wasn't accepted from mailing list mail server. Please make sure that your e-mail is plain text type for mailing list.
[...]

thank you, I should notice, next time.

Chen Gang

Asianux Corporation