Merge "qseecom: Fix compilation errors" into msm-4.9 (6765abb8) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/misc/qseecom.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -1111,7 +1111,7 @@ static int __qseecom_set_sb_memory(struct qseecom_registered_listener_list *svc,
		size_t cmd_len;

		/* Get the handle of the shared fd */
		svc->ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		svc->ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		listener->ifd_data_fd);
		if (IS_ERR_OR_NULL(svc->ihandle)) {
		pr_err("Ion client could not retrieve the handle\n");
		@@ -1563,7 +1563,7 @@ static int qseecom_set_client_mem_param(struct qseecom_dev_handle *data,
		return -EFAULT;

		/* Get the handle of the shared fd */
		data->client.ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		data->client.ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		req.ifd_data_fd);
		if (IS_ERR_OR_NULL(data->client.ihandle)) {
		pr_err("Ion client could not retrieve the handle\n");
		@@ -2322,7 +2322,7 @@ static int qseecom_load_app(struct qseecom_dev_handle data, void __user argp)
		pr_warn("App (%s) does'nt exist, loading apps for first time\n",
		(char *)(load_img_req.img_name));
		/* Get the handle of the shared fd */
		ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		load_img_req.ifd_data_fd);
		if (IS_ERR_OR_NULL(ihandle)) {
		pr_err("Ion client could not retrieve the handle\n");
		@@ -3263,7 +3263,7 @@ static int __qseecom_update_cmd_buf(void *msg, bool cleanup,
		for (i = 0; i < MAX_ION_FD; i++) {
		if ((data->type != QSEECOM_LISTENER_SERVICE) &&
		(req->ifd_data[i].fd > 0)) {
		ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		req->ifd_data[i].fd);
		if (IS_ERR_OR_NULL(ihandle)) {
		pr_err("Ion client can't retrieve the handle\n");
		@@ -3273,7 +3273,7 @@ static int __qseecom_update_cmd_buf(void *msg, bool cleanup,
		req->ifd_data[i].cmd_buf_offset;
		} else if ((data->type == QSEECOM_LISTENER_SERVICE) &&
		(lstnr_resp->ifd_data[i].fd > 0)) {
		ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		lstnr_resp->ifd_data[i].fd);
		if (IS_ERR_OR_NULL(ihandle)) {
		pr_err("Ion client can't retrieve the handle\n");
		@@ -3527,7 +3527,7 @@ static int __qseecom_update_cmd_buf_64(void *msg, bool cleanup,
		for (i = 0; i < MAX_ION_FD; i++) {
		if ((data->type != QSEECOM_LISTENER_SERVICE) &&
		(req->ifd_data[i].fd > 0)) {
		ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		req->ifd_data[i].fd);
		if (IS_ERR_OR_NULL(ihandle)) {
		pr_err("Ion client can't retrieve the handle\n");
		@@ -3537,7 +3537,7 @@ static int __qseecom_update_cmd_buf_64(void *msg, bool cleanup,
		req->ifd_data[i].cmd_buf_offset;
		} else if ((data->type == QSEECOM_LISTENER_SERVICE) &&
		(lstnr_resp->ifd_data[i].fd > 0)) {
		ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		lstnr_resp->ifd_data[i].fd);
		if (IS_ERR_OR_NULL(ihandle)) {
		pr_err("Ion client can't retrieve the handle\n");
		@@ -5145,7 +5145,7 @@ static int qseecom_load_external_elf(struct qseecom_dev_handle *data,
		}

		/* Get the handle of the shared fd */
		ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		load_img_req.ifd_data_fd);
		if (IS_ERR_OR_NULL(ihandle)) {
		pr_err("Ion client could not retrieve the handle\n");
		@@ -6375,7 +6375,7 @@ static int __qseecom_update_qteec_req_buf(struct qseecom_qteec_modfd_req *req,
		}
		for (i = 0; i < MAX_ION_FD; i++) {
		if (req->ifd_data[i].fd > 0) {
		ihandle = ion_import_dma_buf(qseecom.ion_clnt,
		ihandle = ion_import_dma_buf_fd(qseecom.ion_clnt,
		req->ifd_data[i].fd);
		if (IS_ERR_OR_NULL(ihandle)) {
		pr_err("Ion client can't retrieve the handle\n");