From 17344d786c83b8da3c53baba1c2a878fb884d2bb Mon Sep 17 00:00:00 2001 From: Swetha Chikkaboraiah Date: Fri, 13 Aug 2021 09:40:52 +0530 Subject: [PATCH] driver: Fix compilation error with new sdclang 12 Fix the compilation error with sdclang 12.0. Change-Id: If6b5caf655568b0d4ee12a71927df9476f3b4c55 Signed-off-by: Swetha Chikkaboraiah --- drivers/char/diag/diagmem.c | 2 +- drivers/media/platform/msm/vidc_3x/venus_hfi.c | 2 +- drivers/misc/qseecom.c | 4 ++-- drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c | 4 ++-- drivers/video/fbdev/msm/mdss_hdmi_tx.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/char/diag/diagmem.c b/drivers/char/diag/diagmem.c index 3cec3053070c..e2d99204f3ac 100644 --- a/drivers/char/diag/diagmem.c +++ b/drivers/char/diag/diagmem.c @@ -172,7 +172,7 @@ void *diagmem_alloc(struct diagchar_dev *driver, int size, int pool_type) break; } if (size == 0 || size > mempool->itemsize || - size > (int)mempool->pool->pool_data) { + size > (size_t)mempool->pool->pool_data) { pr_err_ratelimited("diag: cannot alloc from mempool %s, invalid size: %d\n", mempool->name, size); break; diff --git a/drivers/media/platform/msm/vidc_3x/venus_hfi.c b/drivers/media/platform/msm/vidc_3x/venus_hfi.c index d25c3c3b2da5..113fcd299e37 100644 --- a/drivers/media/platform/msm/vidc_3x/venus_hfi.c +++ b/drivers/media/platform/msm/vidc_3x/venus_hfi.c @@ -135,7 +135,7 @@ static void __dump_packet(u8 *packet) /* row must contain enough for 0xdeadbaad * 8 to be converted into * "de ad ba ab " * 8 + '\0' */ - char row[3 * row_size]; + char row[96]; /*char row[3 * row_size];*/ for (c = 0; c * row_size < packet_size; ++c) { int bytes_to_read = ((c + 1) * row_size > packet_size) ? diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c index f4f3f7bf0a9d..d91f8fcab152 100644 --- a/drivers/misc/qseecom.c +++ b/drivers/misc/qseecom.c @@ -3704,8 +3704,8 @@ static int __qseecom_send_cmd(struct qseecom_dev_handle *data, (uint32_t)(__qseecom_uvirt_to_kphys( data, (uintptr_t)req->resp_buf)); } else { - send_data_req.req_ptr = (uint32_t)req->cmd_req_buf; - send_data_req.rsp_ptr = (uint32_t)req->resp_buf; + send_data_req.req_ptr = (uintptr_t)req->cmd_req_buf; + send_data_req.rsp_ptr = (uintptr_t)req->resp_buf; } send_data_req.req_len = req->cmd_req_len; diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c index 3edca59dcf8c..560ee549d410 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2019, 2021, The Linux Foundation. All rights reserved. */ #include "ipahal.h" @@ -225,7 +225,7 @@ static struct ipahal_stats_init_pyld *ipahal_generate_init_pyld_flt_rt_v4_5( void *params, bool is_atomic_ctx) { struct ipahal_stats_init_pyld *pyld; - int num = (int)(params); + int num = (uintptr_t)(params); if (num > IPA_MAX_FLT_RT_CNT_INDEX || num <= 0) { diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index 971e09cfb8e4..6962c6efb4dc 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2010-2018, 2020, The Linux Foundation. All rights reserved. */ +/* Copyright (c) 2010-2018, 2020, 2021, The Linux Foundation. All rights reserved. */ #include #include @@ -649,7 +649,7 @@ static ssize_t edid_store(struct device *dev, memset(hdmi_ctrl->edid_buf, 0, hdmi_ctrl->edid_buf_size); while (edid_size--) { - char t[char_to_nib + 1]; + char t[3]; /* char_to_nib + 1; */ int d; memcpy(t, buf_t, sizeof(char) * char_to_nib);