From eab8003c4c819b99962c44716b5f30abbe679a6d Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Mon, 18 Apr 2022 12:32:14 +0000 Subject: [PATCH] platform: dce: remove unused rpc_sync macro DCE_IPC_WAIT_TYPE_SYNC is not used anymore for RPC. This patch get rid of DCE_IPC_WAIT_TYPE_SYNC define from the code. Bug 3472984 Change-Id: Iae0237e39f12f6cb170297f95fa6a39bc64e694a Signed-off-by: Mahesh Kumar Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2699028 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-cert Reviewed-by: svcacv Reviewed-by: svc_kernel_abi Reviewed-by: Arun Swain GVS: Gerrit_Virtual_Submit --- drivers/platform/tegra/dce/dce-admin.c | 3 --- drivers/platform/tegra/dce/dce-client-ipc.c | 21 +------------------ drivers/platform/tegra/dce/dce-ipc.c | 2 +- .../dce/include/dce-client-ipc-internal.h | 4 ++-- drivers/platform/tegra/dce/include/dce-ipc.h | 5 ++--- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/drivers/platform/tegra/dce/dce-admin.c b/drivers/platform/tegra/dce/dce-admin.c index 3211f6f4..e0f4902b 100644 --- a/drivers/platform/tegra/dce/dce-admin.c +++ b/drivers/platform/tegra/dce/dce-admin.c @@ -33,9 +33,6 @@ int dce_admin_ipc_wait(struct tegra_dce *d, u32 w_type) struct admin_rpc_post_boot_info *admin_rpc = &d->admin_rpc; switch (w_type) { - case DCE_IPC_WAIT_TYPE_SYNC: - event = EVENT_ID_DCE_IPC_MESSAGE_SENT; - break; case DCE_IPC_WAIT_TYPE_RPC: event = EVENT_ID_DCE_IPC_MESSAGE_SENT; break; diff --git a/drivers/platform/tegra/dce/dce-client-ipc.c b/drivers/platform/tegra/dce/dce-client-ipc.c index 0fe190ec..2d889b2c 100644 --- a/drivers/platform/tegra/dce/dce-client-ipc.c +++ b/drivers/platform/tegra/dce/dce-client-ipc.c @@ -258,7 +258,7 @@ void dce_client_deinit(struct tegra_dce *d) destroy_workqueue(d_aipc->async_event_wq); } -static int dce_client_ipc_wait_rpc(struct tegra_dce *d, u32 int_type) +int dce_client_ipc_wait(struct tegra_dce *d, u32 int_type) { uint32_t type; struct tegra_dce_client_ipc *cl; @@ -289,25 +289,6 @@ retry_wait: return 0; } -int dce_client_ipc_wait(struct tegra_dce *d, u32 w_type, u32 ch_type) -{ - int ret = 0; - - switch (w_type) { - case DCE_IPC_WAIT_TYPE_SYNC: - ret = dce_admin_ipc_wait(d, w_type); - break; - case DCE_IPC_WAIT_TYPE_RPC: - ret = dce_client_ipc_wait_rpc(d, ch_type); - break; - default: - dce_err(d, "Invalid wait type [%d]", w_type); - break; - } - - return ret; -} - static void dce_client_process_event_ipc(struct tegra_dce *d, struct tegra_dce_client_ipc *cl) { diff --git a/drivers/platform/tegra/dce/dce-ipc.c b/drivers/platform/tegra/dce/dce-ipc.c index 00af55cd..d28ac499 100644 --- a/drivers/platform/tegra/dce/dce-ipc.c +++ b/drivers/platform/tegra/dce/dce-ipc.c @@ -235,7 +235,7 @@ static int _dce_ipc_wait(struct tegra_dce *d, u32 w_type, u32 ch_type) if (ch_type == DCE_IPC_TYPE_ADMIN) ret = dce_admin_ipc_wait(d, w_type); else - ret = dce_client_ipc_wait(d, w_type, ch_type); + ret = dce_client_ipc_wait(d, ch_type); dce_mutex_lock(&ch->lock); diff --git a/drivers/platform/tegra/dce/include/dce-client-ipc-internal.h b/drivers/platform/tegra/dce/include/dce-client-ipc-internal.h index 6e86302b..ff82b5fb 100644 --- a/drivers/platform/tegra/dce/include/dce-client-ipc-internal.h +++ b/drivers/platform/tegra/dce/include/dce-client-ipc-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -62,7 +62,7 @@ struct tegra_dce_async_ipc_info { void dce_client_ipc_wakeup(struct tegra_dce *d, u32 ch_type); -int dce_client_ipc_wait(struct tegra_dce *d, u32 w_type, u32 ch_type); +int dce_client_ipc_wait(struct tegra_dce *d, u32 ch_type); int dce_client_init(struct tegra_dce *d); diff --git a/drivers/platform/tegra/dce/include/dce-ipc.h b/drivers/platform/tegra/dce/include/dce-ipc.h index c4a9dc30..21bc3019 100644 --- a/drivers/platform/tegra/dce/include/dce-ipc.h +++ b/drivers/platform/tegra/dce/include/dce-ipc.h @@ -36,9 +36,8 @@ #define DCE_DISPRM_EVENT_NOTIFY_CMD_MAX_FSIZE 4096U #define DCE_ADMIN_CMD_MAX_FSIZE 1024U -#define DCE_IPC_WAIT_TYPE_INVALID 0U -#define DCE_IPC_WAIT_TYPE_SYNC 1U -#define DCE_IPC_WAIT_TYPE_RPC 2U +#define DCE_IPC_WAIT_TYPE_INVALID 0U +#define DCE_IPC_WAIT_TYPE_RPC 1U #define DCE_IPC_CHANNEL_VALID BIT(0) #define DCE_IPC_CHANNEL_INITIALIZED BIT(1)