Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6a53dd6 authored by Mitchel Humpherys's avatar Mitchel Humpherys
Browse files

ion: rename some clashing callback functions 



We have some callback functions (request_region, release_region) that
clash with macros defined in <linux/ioport.h> (which is included by
<linux/device.h>). Rename the callbacks to not clash with the ioport
macros.

Change-Id: I69851b24cbb84538967e44cf40531eb2149026e5
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent d4b1fae3

drivers/staging/android/ion/ion_removed_heap.c

+14 −14
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ struct ion_removed_heap { 
	ion_phys_addr_t base;

	unsigned long allocated_bytes;

	unsigned long total_size;

	int (*request_region)(void *);

	int (*release_region)(void *);

	int (*request_ion_region)(void *);

	int (*release_ion_region)(void *);

	atomic_t map_count;

	void *bus_id;

};
@@ -142,8 +142,8 @@ static int ion_removed_request_region(struct ion_removed_heap *removed_heap) 
{

	int ret_value = 0;

	if (atomic_inc_return(&removed_heap->map_count) == 1) {

		if (removed_heap->request_region) {

			ret_value = removed_heap->request_region(

		if (removed_heap->request_ion_region) {

			ret_value = removed_heap->request_ion_region(

						removed_heap->bus_id);

			if (ret_value) {

				pr_err("Unable to request SMI region");
@@ -158,8 +158,8 @@ static int ion_removed_release_region(struct ion_removed_heap *removed_heap) 
{

	int ret_value = 0;

	if (atomic_dec_and_test(&removed_heap->map_count)) {

		if (removed_heap->release_region) {

			ret_value = removed_heap->release_region(

		if (removed_heap->release_ion_region) {

			ret_value = removed_heap->release_ion_region(

						removed_heap->bus_id);

			if (ret_value)

				pr_err("Unable to release SMI region");
@@ -328,14 +328,14 @@ struct ion_heap *ion_removed_heap_create(struct ion_platform_heap *heap_data) 
		struct ion_co_heap_pdata *extra_data =

				heap_data->extra_data;



		if (extra_data->setup_region)

			removed_heap->bus_id = extra_data->setup_region();

		if (extra_data->request_region)

			removed_heap->request_region =

					extra_data->request_region;

		if (extra_data->release_region)

			removed_heap->release_region =

					extra_data->release_region;

		if (extra_data->setup_ion_region)

			removed_heap->bus_id = extra_data->setup_ion_region();

		if (extra_data->request_ion_region)

			removed_heap->request_ion_region =

					extra_data->request_ion_region;

		if (extra_data->release_ion_region)

			removed_heap->release_ion_region =

					extra_data->release_ion_region;

	}

	return &removed_heap->heap;

}

drivers/staging/android/ion/msm/msm_ion.h

+12 −12
Original line number Diff line number Diff line
@@ -36,11 +36,11 @@ enum ion_permission_type { 
 * @fixed_position	If nonzero, position in the fixed area.

 * @iommu_map_all:	Indicates whether we should map whole heap into IOMMU.

 * @iommu_2x_map_domain: Indicates the domain to use for overmapping.

 * @request_region:	function to be called when the number of allocations

 * @request_ion_region:	function to be called when the number of allocations

 *			goes from 0 -> 1

 * @release_region:	function to be called when the number of allocations

 * @release_ion_region:	function to be called when the number of allocations

 *			goes from 1 -> 0

 * @setup_region:	function to be called upon ion registration

 * @setup_ion_region:	function to be called upon ion registration

 * @allow_nonsecure_alloc: allow non-secure allocations from this heap. For

 *			secure heaps, this flag must be set so allow non-secure

 *			allocations. For non-secure heaps, this flag is ignored.
@@ -55,9 +55,9 @@ struct ion_cp_heap_pdata { 
	enum ion_fixed_position fixed_position;

	int iommu_map_all;

	int iommu_2x_map_domain;

	int (*request_region)(void *);

	int (*release_region)(void *);

	void *(*setup_region)(void);

	int (*request_ion_region)(void *);

	int (*release_ion_region)(void *);

	void *(*setup_ion_region)(void);

	int allow_nonsecure_alloc;

};
@@ -66,11 +66,11 @@ struct ion_cp_heap_pdata { 
 * @adjacent_mem_id:	Id of heap that this heap must be adjacent to.

 * @align:		Alignment requirement for the memory

 * @fixed_position	If nonzero, position in the fixed area.

 * @request_region:	function to be called when the number of allocations

 * @request_ion_region:	function to be called when the number of allocations

 *			goes from 0 -> 1

 * @release_region:	function to be called when the number of allocations

 * @release_ion_region:	function to be called when the number of allocations

 *			goes from 1 -> 0

 * @setup_region:	function to be called upon ion registration

 * @setup_ion_region:	function to be called upon ion registration

 * @memory_type:Memory type used for the heap

 *

 */
@@ -78,9 +78,9 @@ struct ion_co_heap_pdata { 
	int adjacent_mem_id;

	unsigned int align;

	enum ion_fixed_position fixed_position;

	int (*request_region)(void *);

	int (*release_region)(void *);

	void *(*setup_region)(void);

	int (*request_ion_region)(void *);

	int (*release_ion_region)(void *);

	void *(*setup_ion_region)(void);

};



/**