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

Commit 6d2e7d07 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: msm: remove superfluous function argument"

parents d61f4ca1 61b82c21

arch/arm/mach-msm/smcmod.c

+4 −4
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int smcmod_send_buf_cmd(struct smcmod_buf_req *reqp) 
		return -EINVAL;



	/* create an ion client */

	ion_clientp = msm_ion_client_create(UINT_MAX, "smcmod");

	ion_clientp = msm_ion_client_create("smcmod");



	/* check for errors */

	if (IS_ERR_OR_NULL(ion_clientp))
@@ -269,7 +269,7 @@ static int smcmod_send_cipher_cmd(struct smcmod_cipher_req *reqp) 
		return -EINVAL;



	/* create an ion client */

	ion_clientp = msm_ion_client_create(UINT_MAX, "smcmod");

	ion_clientp = msm_ion_client_create("smcmod");



	/* check for errors */

	if (IS_ERR_OR_NULL(ion_clientp))
@@ -413,7 +413,7 @@ static int smcmod_send_msg_digest_cmd(struct smcmod_msg_digest_req *reqp) 
		return -EINVAL;



	/* create an ion client */

	ion_clientp = msm_ion_client_create(UINT_MAX, "smcmod");

	ion_clientp = msm_ion_client_create("smcmod");



	/* check for errors */

	if (IS_ERR_OR_NULL(ion_clientp))
@@ -530,7 +530,7 @@ static int smcmod_send_dec_cmd(struct smcmod_decrypt_req *reqp) 
		u32 args[3];

	} rsp;



	ion_clientp = msm_ion_client_create(UINT_MAX, "smcmod");

	ion_clientp = msm_ion_client_create("smcmod");

	if (IS_ERR_OR_NULL(ion_clientp))

		return PTR_ERR(ion_clientp);

drivers/char/adsprpc.c

+1 −2
Original line number Diff line number Diff line
@@ -881,8 +881,7 @@ static int fastrpc_init(void) 
	context_list_ctor(&me->clst);

	for (i = 0; i < RPC_HASH_SZ; ++i)

		INIT_HLIST_HEAD(&me->htbl[i]);

	me->iclient = msm_ion_client_create(ION_HEAP_CARVEOUT_MASK,

						DEVICE_NAME);

	me->iclient = msm_ion_client_create(DEVICE_NAME);

	VERIFY(err, 0 == IS_ERR_OR_NULL(me->iclient));

	if (err)

		goto bail;

drivers/firmware/qcom/tz_log.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void tzdbg_register_qsee_log_buf(void) 
	int ret = 0;



	/* Create ION msm client */

	g_ion_clnt = msm_ion_client_create(ION_HEAP_CARVEOUT_MASK, "qsee_log");

	g_ion_clnt = msm_ion_client_create("qsee_log");

	if (g_ion_clnt == NULL) {

		pr_err("%s: Ion client cannot be created\n", __func__);

		return;

drivers/gpu/msm/kgsl_drm.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2009-2013, The Linux Foundation. All rights reserved.

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1324,8 +1324,7 @@ int kgsl_drm_init(struct platform_device *dev) 
	INIT_LIST_HEAD(&kgsl_mem_list);



	/* Create ION Client */

	kgsl_drm_ion_client = msm_ion_client_create(

			0xffffffff, "kgsl_drm");

	kgsl_drm_ion_client = msm_ion_client_create("kgsl_drm");

	if (!kgsl_drm_ion_client) {

		DRM_ERROR("Unable to create ION client\n");

		return -ENOMEM;

drivers/media/platform/msm/broadcast/tsc.c

+1 −2
Original line number Diff line number Diff line
@@ -3109,8 +3109,7 @@ static int tsc_get_iommu_info(struct platform_device *pdev) 
	int ret = 0;



	/* Create a new ION client used by tsc ci to allocate memory */

	tsc_device->iommu_info.ion_client = msm_ion_client_create(UINT_MAX,

			"tsc_client");

	tsc_device->iommu_info.ion_client = msm_ion_client_create("tsc_client");

	if (IS_ERR_OR_NULL(tsc_device->iommu_info.ion_client)) {

		pr_err("%s: error in ion_client_create", __func__);

		ret = PTR_ERR(tsc_device->iommu_info.ion_client);