diff mbox

[v3,01/12] ARM: EXYNOS: Make exynos machine_ops as static

Message ID 1398835057-3860-2-git-send-email-pankaj.dubey@samsung.com (mailing list archive)
State New, archived
Headers show

Commit Message

Pankaj Dubey April 30, 2014, 5:17 a.m. UTC 
As machine function ops are used only in this file let's make
them static.

Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
---
 arch/arm/mach-exynos/exynos.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Sachin Kamat April 30, 2014, 6 a.m. UTC | #1 
Hi Pankaj,

On 30 April 2014 10:47, Pankaj Dubey <pankaj.dubey@samsung.com> wrote:
> As machine function ops are used only in this file let's make
> them static.
>
> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
> ---
>  arch/arm/mach-exynos/exynos.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
> index 3d69e8d..06dcce5 100644
> --- a/arch/arm/mach-exynos/exynos.c
> +++ b/arch/arm/mach-exynos/exynos.c
> @@ -198,7 +198,7 @@ static struct map_desc exynos5_iodesc[] __initdata = {
>         },
>  };
>
> -void exynos_restart(enum reboot_mode mode, const char *cmd)
> +static void exynos_restart(enum reboot_mode mode, const char *cmd)
>  {
>         struct device_node *np;
>         u32 val = 0x1;
> @@ -239,7 +239,7 @@ void __init exynos_cpufreq_init(void)
>         platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
>  }
>
> -void __init exynos_init_late(void)
> +static void __init exynos_init_late(void)
>  {
>         if (of_machine_is_compatible("samsung,exynos5440"))
>                 /* to be supported later */
> @@ -300,7 +300,7 @@ static void __init exynos_map_io(void)
>                 iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));
>  }
>
> -void __init exynos_init_io(void)
> +static void __init exynos_init_io(void)
>  {
>         debug_ll_io_init();


The declarations from common.h should also be removed in this patch to
avoid the below
build errors:

arch/arm/mach-exynos/exynos.c:198:13: error: static declaration of
‘exynos_restart’ follows non-static declaration
 static void exynos_restart(enum reboot_mode mode, const char *cmd)
             ^
In file included from arch/arm/mach-exynos/exynos.c:31:0:
arch/arm/mach-exynos/common.h:22:6: note: previous declaration of
‘exynos_restart’ was here
 void exynos_restart(enum reboot_mode mode, const char *cmd);
      ^
arch/arm/mach-exynos/exynos.c:235:20: error: static declaration of
‘exynos_init_late’ follows non-static declaration
 static void __init exynos_init_late(void)
                    ^
In file included from arch/arm/mach-exynos/exynos.c:31:0:
arch/arm/mach-exynos/common.h:25:6: note: previous declaration of
‘exynos_init_late’ was here
 void exynos_init_late(void);
      ^
arch/arm/mach-exynos/exynos.c:296:20: error: static declaration of
‘exynos_init_io’ follows non-static declaration
 static void __init exynos_init_io(void)
                    ^
In file included from arch/arm/mach-exynos/exynos.c:31:0:
arch/arm/mach-exynos/common.h:21:6: note: previous declaration of
‘exynos_init_io’ was here
 void exynos_init_io(void);
Pankaj Dubey April 30, 2014, 7:35 a.m. UTC | #2 
Hi Sachin,

On 04/30/2014 03:00 PM, Sachin Kamat wrote:
> Hi Pankaj,
>
> On 30 April 2014 10:47, Pankaj Dubey <pankaj.dubey@samsung.com> wrote:
>> As machine function ops are used only in this file let's make
>> them static.
>>
>> Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
>> ---
>>   arch/arm/mach-exynos/exynos.c |    6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
>> index 3d69e8d..06dcce5 100644
>> --- a/arch/arm/mach-exynos/exynos.c
>> +++ b/arch/arm/mach-exynos/exynos.c
>> @@ -198,7 +198,7 @@ static struct map_desc exynos5_iodesc[] __initdata = {
>>          },
>>   };
>>
>> -void exynos_restart(enum reboot_mode mode, const char *cmd)
>> +static void exynos_restart(enum reboot_mode mode, const char *cmd)
>>   {
>>          struct device_node *np;
>>          u32 val = 0x1;
>> @@ -239,7 +239,7 @@ void __init exynos_cpufreq_init(void)
>>          platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
>>   }
>>
>> -void __init exynos_init_late(void)
>> +static void __init exynos_init_late(void)
>>   {
>>          if (of_machine_is_compatible("samsung,exynos5440"))
>>                  /* to be supported later */
>> @@ -300,7 +300,7 @@ static void __init exynos_map_io(void)
>>                  iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));
>>   }
>>
>> -void __init exynos_init_io(void)
>> +static void __init exynos_init_io(void)
>>   {
>>          debug_ll_io_init();
>
> The declarations from common.h should also be removed in this patch to
> avoid the below
> build errors:

Thanks. I will merge changes in common.h in this patch itself.

>
> arch/arm/mach-exynos/exynos.c:198:13: error: static declaration of
> ‘exynos_restart’ follows non-static declaration
>   static void exynos_restart(enum reboot_mode mode, const char *cmd)
>               ^
> In file included from arch/arm/mach-exynos/exynos.c:31:0:
> arch/arm/mach-exynos/common.h:22:6: note: previous declaration of
> ‘exynos_restart’ was here
>   void exynos_restart(enum reboot_mode mode, const char *cmd);
>        ^
> arch/arm/mach-exynos/exynos.c:235:20: error: static declaration of
> ‘exynos_init_late’ follows non-static declaration
>   static void __init exynos_init_late(void)
>                      ^
> In file included from arch/arm/mach-exynos/exynos.c:31:0:
> arch/arm/mach-exynos/common.h:25:6: note: previous declaration of
> ‘exynos_init_late’ was here
>   void exynos_init_late(void);
>        ^
> arch/arm/mach-exynos/exynos.c:296:20: error: static declaration of
> ‘exynos_init_io’ follows non-static declaration
>   static void __init exynos_init_io(void)
>                      ^
> In file included from arch/arm/mach-exynos/exynos.c:31:0:
> arch/arm/mach-exynos/common.h:21:6: note: previous declaration of
> ‘exynos_init_io’ was here
>   void exynos_init_io(void);
>
>
diff mbox

Patch

diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 3d69e8d..06dcce5 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -198,7 +198,7 @@  static struct map_desc exynos5_iodesc[] __initdata = {
 	},
 };
 
-void exynos_restart(enum reboot_mode mode, const char *cmd)
+static void exynos_restart(enum reboot_mode mode, const char *cmd)
 {
 	struct device_node *np;
 	u32 val = 0x1;
@@ -239,7 +239,7 @@  void __init exynos_cpufreq_init(void)
 	platform_device_register_simple("exynos-cpufreq", -1, NULL, 0);
 }
 
-void __init exynos_init_late(void)
+static void __init exynos_init_late(void)
 {
 	if (of_machine_is_compatible("samsung,exynos5440"))
 		/* to be supported later */
@@ -300,7 +300,7 @@  static void __init exynos_map_io(void)
 		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));
 }
 
-void __init exynos_init_io(void)
+static void __init exynos_init_io(void)
 {
 	debug_ll_io_init();