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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index c4f0795fb62e086d41a7d64b753710f46cad075b..a8ea97391c40f985ac1ee801edf5991dd97fd710 100644 (file)
--- 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 de0899a02322c9bbe91fc2c1f3704aef7cfc9686..3486909a831010787a50668f234089832b006e79 100644 (file)
--- 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;