diff mbox

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

Message ID 50EAC016.6090707@asianux.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chen Gang Jan. 7, 2013, 12:31 p.m. UTC
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 <gang.chen@asianux.com>
---
 arch/arm/mach-s5pv210/common.c |    9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Chen Gang Jan. 15, 2013, 10:02 a.m. UTC | #1
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.


? 2013?01?07? 20:31, 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 <gang.chen@asianux.com>
> ---
>  arch/arm/mach-s5pv210/common.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
> index 9dfe93e..5c88f88 100644
> --- a/arch/arm/mach-s5pv210/common.c
> +++ b/arch/arm/mach-s5pv210/common.c
> @@ -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 */
>
Kim Kukjin Jan. 18, 2013, 12:14 a.m. UTC | #2
Chen Gang wrote:
> 
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.

> 
>   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.
> 
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.

> 
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
>  arch/arm/mach-s5pv210/common.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-
> s5pv210/common.c
> index 9dfe93e..5c88f88 100644
> --- a/arch/arm/mach-s5pv210/common.c
> +++ b/arch/arm/mach-s5pv210/common.c
> @@ -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 */
> +
> +

Generally, no need double empty lines here.

>  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 */
> --
> 1.7.10.4

Thanks.

- Kukjin
Kim Kukjin Jan. 18, 2013, 3:33 a.m. UTC | #3
Chen,Gang( ??) wrote:
> 
> 
> > For subject:
> > Please see the git log before your commit, it should be helpful to you.
> > In this case, 'ARM: S5PV210: ...' is used.
> 
>   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.

[...]

> > 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 Jan. 18, 2013, 1:47 p.m. UTC | #4
On 01/18/2013 11:33 AM, Kukjin Kim wrote:
> Chen,Gang( ??) wrote:
>>   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.



> 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
diff mbox

Patch

diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index 9dfe93e..5c88f88 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -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 */