Linux Kernels

staging: android: ion: Drop ion_carveout_allocate definitions

This change “staging: android: ion: Drop ion_carveout_allocate definitions” (commit 0ba5aa4) in Linux kernel is authored by Laura Abbott <labbott [at] redhat.com> on Mon Aug 8 09:52:57 2016 -0700.

Description of "staging: android: ion: Drop ion_carveout_allocate definitions"

The change “staging: android: ion: Drop ion_carveout_allocate definitions” introduces changes as follows.

staging: android: ion: Drop ion_carveout_allocate definitions

ion_carveout_allocate and ion_carveout_free aren't used outside of the
carveout heap. Get rid of the definitions.

Signed-off-by: Laura Abbott <labbott@redhat.com>
Reviewed-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Linux kernel releases containing commit 0ba5aa4

The Linux kernel releases containing this commit are as follows.

Linux kernel code changes from "staging: android: ion: Drop ion_carveout_allocate definitions"

There are 16 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/staging/android/ion/ion_carveout_heap.c |  2 ++
 drivers/staging/android/ion/ion_priv.h          | 14 --------------
 2 files changed, 2 insertions(+), 14 deletions(-)
 
diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index cc2a3b8160bc..c4f0795fb62e 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -25,6 +25,8 @@
 #include "ion.h"
 #include "ion_priv.h"
 
+#define ION_CARVEOUT_ALLOCATE_FAIL	-1
+
 struct ion_carveout_heap {
 	struct ion_heap heap;
 	struct gen_pool *pool;
diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h
index 3dd91172540b..25e4bb2dac87 100644
--- a/drivers/staging/android/ion/ion_priv.h
+++ b/drivers/staging/android/ion/ion_priv.h
@@ -313,20 +313,6 @@ void ion_chunk_heap_destroy(struct ion_heap *);
 struct ion_heap *ion_cma_heap_create(struct ion_platform_heap *);
 void ion_cma_heap_destroy(struct ion_heap *);
 
-/**
- * kernel api to allocate/free from carveout -- used when carveout is
- * used to back an architecture specific custom heap
- */
-ion_phys_addr_t ion_carveout_allocate(struct ion_heap *heap, unsigned long size,
-				      unsigned long align);
-void ion_carveout_free(struct ion_heap *heap, ion_phys_addr_t addr,
-		       unsigned long size);
-/**
- * The carveout heap returns physical addresses, since 0 may be a valid
- * physical address, this is used to indicate allocation failed
- */
-#define ION_CARVEOUT_ALLOCATE_FAIL -1
-
 /**
  * functions for creating and destroying a heap pool -- allows you
  * to keep a pool of pre allocated memory to use from your heap.  Keeping

The commit for this change in Linux stable tree is 0ba5aa4 (patch).

Last modified: 2020/01/11 09:27