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

Commit c08c358f authored by Jordan Crouse's avatar Jordan Crouse
Browse files

ion: Fix a handful of warnings 



Fix a handful of warnings for incorrect printk() arguments.

Change-Id: Ic0dedbad09a793129c2298eb557133006fdc5b2e
Signed-off-by: default avatarJordan Crouse <jcrouse@codeaurora.org>
parent be7c1ced

drivers/staging/android/ion/ion_secure_util.c

+4 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/slab.h>
@@ -253,7 +253,7 @@ int ion_hyp_assign_from_flags(u64 base, u64 size, unsigned long flags) 


	if ((flags & ~ION_FLAGS_CP_MASK) ||

	    populate_vm_list(flags, vmids, nr)) {

		pr_err("%s: Failed to parse secure flags 0x%x\n", __func__,

		pr_err("%s: Failed to parse secure flags 0x%lx\n", __func__,

		       flags);

		goto out;

	}
@@ -266,7 +266,8 @@ int ion_hyp_assign_from_flags(u64 base, u64 size, unsigned long flags) 


	ret = hyp_assign_phys(base, size, &src_vm, 1, vmids, modes, nr);

	if (ret)

		pr_err("%s: Assign call failed, flags 0x%x\n", __func__, flags);

		pr_err("%s: Assign call failed, flags 0x%lx\n", __func__,

		       flags);



out:

	kfree(modes);

drivers/staging/android/ion/ion_system_secure_heap.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 */



#include <linux/slab.h>
@@ -104,7 +104,7 @@ static void process_one_prefetch(struct ion_heap *sys_heap, 
	ret = sys_heap->ops->allocate(sys_heap, &buffer, info->size,

					buffer.flags);

	if (ret) {

		pr_debug("%s: Failed to prefetch 0x%zx, ret = %d\n",

		pr_debug("%s: Failed to prefetch 0x%llx, ret = %d\n",

			 __func__, info->size, ret);

		return;

	}
@@ -165,7 +165,7 @@ static void process_one_shrink(struct ion_heap *sys_heap, 
	size = min_t(size_t, pool_size, info->size);

	ret = sys_heap->ops->allocate(sys_heap, &buffer, size, buffer.flags);

	if (ret) {

		pr_debug("%s: Failed to shrink 0x%zx, ret = %d\n",

		pr_debug("%s: Failed to shrink 0x%llx, ret = %d\n",

			 __func__, info->size, ret);

		return;

	}