Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1490065 > unrolled thread

[PATCH] staging: android: ion: mark symbols static where possible

Back to article view | Back to linux.kernel

Contents

  [PATCH] staging: android: ion: mark symbols static where possible Baoyou Xie <baoyou.xie@linaro.org> - 2016-09-23 15:20 +0200
    Re: [PATCH] staging: android: ion: mark symbols static where possible Laura Abbott <labbott@redhat.com> - 2016-09-23 19:10 +0200

#1490065 — [PATCH] staging: android: ion: mark symbols static where possible

We get 4 warnings when building kernel with W=1:
drivers/staging/android/ion/ion_carveout_heap.c:36:17: warning: no previous prototype for 'ion_carveout_allocate' [-Wmissing-prototypes]
drivers/staging/android/ion/ion_carveout_heap.c:50:6: warning: no previous prototype for 'ion_carveout_free' [-Wmissing-prototypes]
drivers/staging/android/ion/ion_of.c:28:5: warning: no previous prototype for 'ion_parse_dt_heap_common' [-Wmissing-prototypes]
drivers/staging/android/ion/ion_of.c:54:5: warning: no previous prototype for 'ion_setup_heap_common' [-Wmissing-prototypes]

In fact, these functions are only used in the file in which they are
declared and don't need a declaration, but can be made static.
so this patch marks these functions with 'static'.

Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
---
 drivers/staging/android/ion/ion_carveout_heap.c | 10 +++++-----
 drivers/staging/android/ion/ion_of.c            | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index c4f0795..a8ea973 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -33,9 +33,9 @@ struct ion_carveout_heap {
 	ion_phys_addr_t base;
 };
 
-ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
-				      unsigned long size,
-				      unsigned long align)
+static ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
+					     unsigned long size,
+					     unsigned long align)
 {
 	struct ion_carveout_heap *carveout_heap =
 		container_of(heap, struct ion_carveout_heap, heap);
@@ -47,8 +47,8 @@ ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
 	return offset;
 }
 
-void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr,
-		       unsigned long size)
+static void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr,
+			      unsigned long size)
 {
 	struct ion_carveout_heap *carveout_heap =
 		container_of(heap, struct ion_carveout_heap, heap);
diff --git a/drivers/staging/android/ion/ion_of.c b/drivers/staging/android/ion/ion_of.c
index de0899a..3486909 100644
--- a/drivers/staging/android/ion/ion_of.c
+++ b/drivers/staging/android/ion/ion_of.c
@@ -25,9 +25,9 @@
 #include "ion_priv.h"
 #include "ion_of.h"
 
-int ion_parse_dt_heap_common(struct device_node *heap_node,
-			struct ion_platform_heap *heap,
-			struct ion_of_heap *compatible)
+static int ion_parse_dt_heap_common(struct device_node *heap_node,
+				    struct ion_platform_heap *heap,
+				    struct ion_of_heap *compatible)
 {
 	int i;
 
@@ -51,9 +51,9 @@ int ion_parse_dt_heap_common(struct device_node *heap_node,
 	return 0;
 }
 
-int ion_setup_heap_common(struct platform_device *parent,
-			struct device_node *heap_node,
-			struct ion_platform_heap *heap)
+static int ion_setup_heap_common(struct platform_device *parent,
+				 struct device_node *heap_node,
+				 struct ion_platform_heap *heap)
 {
 	int ret = 0;
 
-- 
2.7.4

[toc] | [next] | [standalone]

#1490337

On 09/23/2016 06:13 AM, Baoyou Xie wrote:
> We get 4 warnings when building kernel with W=1:
> drivers/staging/android/ion/ion_carveout_heap.c:36:17: warning: no previous prototype for 'ion_carveout_allocate' [-Wmissing-prototypes]
> drivers/staging/android/ion/ion_carveout_heap.c:50:6: warning: no previous prototype for 'ion_carveout_free' [-Wmissing-prototypes]
> drivers/staging/android/ion/ion_of.c:28:5: warning: no previous prototype for 'ion_parse_dt_heap_common' [-Wmissing-prototypes]
> drivers/staging/android/ion/ion_of.c:54:5: warning: no previous prototype for 'ion_setup_heap_common' [-Wmissing-prototypes]
>
> In fact, these functions are only used in the file in which they are
> declared and don't need a declaration, but can be made static.
> so this patch marks these functions with 'static'.
>

Acked-by: Laura Abbott <labbott@redhat.com>

> Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
> ---
>  drivers/staging/android/ion/ion_carveout_heap.c | 10 +++++-----
>  drivers/staging/android/ion/ion_of.c            | 12 ++++++------
>  2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
> index c4f0795..a8ea973 100644
> --- a/drivers/staging/android/ion/ion_carveout_heap.c
> +++ b/drivers/staging/android/ion/ion_carveout_heap.c
> @@ -33,9 +33,9 @@ struct ion_carveout_heap {
>  	ion_phys_addr_t base;
>  };
>
> -ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
> -				      unsigned long size,
> -				      unsigned long align)
> +static ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
> +					     unsigned long size,
> +					     unsigned long align)
>  {
>  	struct ion_carveout_heap *carveout_heap =
>  		container_of(heap, struct ion_carveout_heap, heap);
> @@ -47,8 +47,8 @@ ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap,
>  	return offset;
>  }
>
> -void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr,
> -		       unsigned long size)
> +static void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr,
> +			      unsigned long size)
>  {
>  	struct ion_carveout_heap *carveout_heap =
>  		container_of(heap, struct ion_carveout_heap, heap);
> diff --git a/drivers/staging/android/ion/ion_of.c b/drivers/staging/android/ion/ion_of.c
> index de0899a..3486909 100644
> --- a/drivers/staging/android/ion/ion_of.c
> +++ b/drivers/staging/android/ion/ion_of.c
> @@ -25,9 +25,9 @@
>  #include "ion_priv.h"
>  #include "ion_of.h"
>
> -int ion_parse_dt_heap_common(struct device_node *heap_node,
> -			struct ion_platform_heap *heap,
> -			struct ion_of_heap *compatible)
> +static int ion_parse_dt_heap_common(struct device_node *heap_node,
> +				    struct ion_platform_heap *heap,
> +				    struct ion_of_heap *compatible)
>  {
>  	int i;
>
> @@ -51,9 +51,9 @@ int ion_parse_dt_heap_common(struct device_node *heap_node,
>  	return 0;
>  }
>
> -int ion_setup_heap_common(struct platform_device *parent,
> -			struct device_node *heap_node,
> -			struct ion_platform_heap *heap)
> +static int ion_setup_heap_common(struct platform_device *parent,
> +				 struct device_node *heap_node,
> +				 struct ion_platform_heap *heap)
>  {
>  	int ret = 0;
>
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web