瀏覽代碼

msm: camera: jpeg: Removing dead code

This change removes some flags and unused variables
in JPEG driver.

CRs-Fixed: 3394193
Change-Id: Iccdadebbd6943322e58da682986c4f6145ca9a64
Signed-off-by: Atiya Kailany <[email protected]>
Atiya Kailany 2 年之前
父節點
當前提交
fc0c352ebe

+ 1 - 7
drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

@@ -887,7 +887,6 @@ static int cam_jpeg_mgr_config_hw(void *hw_mgr_priv, void *config_hw_args)
 	struct cam_hw_config_args                          *config_args = config_hw_args;
 	struct cam_jpeg_hw_ctx_data                        *ctx_data = NULL;
 	struct cam_jpeg_request_data                       *jpeg_req;
-	struct cam_hw_update_entry                         *hw_update_entries;
 	struct crm_workq_task                              *task;
 	struct cam_jpeg_process_frame_work_data_t          *task_data;
 	struct cam_jpeg_hw_cfg_req                         *p_cfg_req = NULL;
@@ -930,7 +929,6 @@ static int cam_jpeg_mgr_config_hw(void *hw_mgr_priv, void *config_hw_args)
 	jpeg_req = (struct cam_jpeg_request_data *)config_args->priv;
 	p_cfg_req->req_id = (uintptr_t)jpeg_req->request_id;
 	p_cfg_req->num_hw_entry_processed = 0;
-	hw_update_entries = config_args->hw_update_entries;
 	CAM_DBG(CAM_JPEG, "req_id: %u, dev_type: %d",
 		p_cfg_req->req_id, ctx_data->jpeg_dev_acquire_info.dev_type);
 	task = cam_req_mgr_workq_get_task(g_jpeg_hw_mgr.work_process_frame);
@@ -1410,7 +1408,6 @@ static int cam_jpeg_mgr_acquire_hw(void *hw_mgr_priv, void *acquire_hw_args)
 	struct cam_jpeg_acquire_dev_info jpeg_dev_acquire_info;
 	struct cam_cdm_acquire_data cdm_acquire;
 	uint32_t dev_type;
-	uint32_t size = 0;
 
 	if ((!hw_mgr_priv) || (!acquire_hw_args)) {
 		CAM_ERR(CAM_JPEG, "Invalid params: %pK %pK", hw_mgr_priv,
@@ -1498,9 +1495,6 @@ static int cam_jpeg_mgr_acquire_hw(void *hw_mgr_priv, void *acquire_hw_args)
 		hw_mgr->cdm_info[dev_type][0].ref_cnt++;
 	}
 
-	size =
-	hw_mgr->cdm_info[dev_type][0].cdm_ops->cdm_required_size_changebase();
-
 	if (hw_mgr->cdm_info[dev_type][0].ref_cnt == 1)
 		if (cam_cdm_stream_on(
 			hw_mgr->cdm_info[dev_type][0].cdm_handle)) {
@@ -1785,7 +1779,7 @@ static int cam_jpeg_init_devices(struct device_node *of_node,
 	g_jpeg_hw_mgr.cdm_reg_map[CAM_JPEG_DEV_DMA][0] =
 		&dma_soc_info->reg_map[0];
 
-	rc = g_jpeg_hw_mgr.devices[CAM_JPEG_DEV_ENC][0]->hw_ops.process_cmd(
+	(void) g_jpeg_hw_mgr.devices[CAM_JPEG_DEV_ENC][0]->hw_ops.process_cmd(
 		g_jpeg_hw_mgr.devices[CAM_JPEG_DEV_ENC][0]->hw_priv,
 		CAM_JPEG_CMD_GET_NUM_PID,
 		&g_jpeg_hw_mgr.num_pid[CAM_JPEG_DEV_ENC],

+ 1 - 8
drivers/cam_jpeg/jpeg_hw/jpeg_dma_hw/jpeg_dma_core.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/of.h>
@@ -295,7 +295,6 @@ int cam_jpeg_dma_reset_hw(void *data,
 int cam_jpeg_dma_test_irq_line(void *data)
 {
 	struct cam_hw_info *jpeg_dma_dev = data;
-	struct cam_jpeg_dma_device_core_info *core_info = NULL;
 	int rc;
 
 	if (!data) {
@@ -303,8 +302,6 @@ int cam_jpeg_dma_test_irq_line(void *data)
 		return -EINVAL;
 	}
 
-	core_info = jpeg_dma_dev->core_info;
-
 	rc = cam_jpeg_dma_init_hw(data, NULL, 0);
 	if (rc) {
 		CAM_ERR(CAM_JPEG, "failed to init hw (rc=%d)", rc);
@@ -485,7 +482,6 @@ int cam_jpeg_dma_dump_camnoc_misr_val(struct cam_jpeg_dma_device_hw_info *hw_inf
 		pmisr_args->req_id,
 		camnoc_misr_val[index][3], camnoc_misr_val[index][2],
 		camnoc_misr_val[index][1], camnoc_misr_val[index][0]);
-	mismatch = false;
 	for (i = 0; i < hw_info->camnoc_misr_sigdata; i++)
 		hw_info->prev_camnoc_misr_val[index][i] =
 			camnoc_misr_val[index][i];
@@ -500,7 +496,6 @@ int cam_jpeg_dma_dump_hw_misr_val(struct cam_jpeg_dma_device_hw_info *hw_info,
 	struct cam_hw_soc_info *soc_info, void *cmd_args)
 {
 	void __iomem                         *dma_mem_base = NULL;
-	void __iomem                         *camnoc_mem_base = NULL;
 	struct cam_jpeg_misr_dump_args       *pmisr_args;
 	int32_t dma_wr_misr_val[CAM_JPEG_CAMNOC_MISR_VAL_ROW][
 		CAM_JPEG_CAMNOC_MISR_VAL_COL] = {{0}};
@@ -512,7 +507,6 @@ int cam_jpeg_dma_dump_hw_misr_val(struct cam_jpeg_dma_device_hw_info *hw_info,
 	bool mismatch = false;
 
 	dma_mem_base = soc_info->reg_map[0].mem_base;
-	camnoc_mem_base = soc_info->reg_map[1].mem_base;
 	pmisr_args = (struct cam_jpeg_misr_dump_args *)cmd_args;
 	if (!pmisr_args) {
 		CAM_ERR(CAM_JPEG, "Invalid command argument");
@@ -592,7 +586,6 @@ int cam_jpeg_dma_dump_hw_misr_val(struct cam_jpeg_dma_device_hw_info *hw_info,
 		dma_wr_misr_val[index][3], dma_wr_misr_val[index][2],
 		dma_wr_misr_val[index][1], dma_wr_misr_val[index][0]);
 
-	mismatch = false;
 	for (i = 0; i < hw_info->max_misr_wr; i++) {
 		hw_info->prev_dma_wr_misr_val[index][i] =
 			dma_wr_misr_val[index][i];

+ 1 - 5
drivers/cam_jpeg/jpeg_hw/jpeg_enc_hw/jpeg_enc_core.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/of.h>
@@ -333,7 +333,6 @@ int cam_jpeg_enc_reset_hw(void *data,
 int cam_jpeg_enc_test_irq_line(void *data)
 {
 	struct cam_hw_info *jpeg_enc_dev = data;
-	struct cam_jpeg_enc_device_core_info *core_info = NULL;
 	int rc;
 
 	if (!data) {
@@ -341,8 +340,6 @@ int cam_jpeg_enc_test_irq_line(void *data)
 		return -EINVAL;
 	}
 
-	core_info = jpeg_enc_dev->core_info;
-
 	rc = cam_jpeg_enc_init_hw(data, NULL, 0);
 	if (rc) {
 		CAM_ERR(CAM_JPEG, "failed to init hw (rc=%d)", rc);
@@ -615,7 +612,6 @@ int cam_jpeg_enc_dump_camnoc_misr_val(struct cam_jpeg_enc_device_hw_info *hw_inf
 		pmisr_args->req_id,
 		camnoc_misr_val[index][3], camnoc_misr_val[index][2],
 		camnoc_misr_val[index][1], camnoc_misr_val[index][0]);
-	mismatch = false;
 	for (i = 0; i < hw_info->camnoc_misr_sigdata; i++)
 		hw_info->prev_camnoc_misr_val[index][i] = camnoc_misr_val[index][i];
 	/* stop misr : cam_noc_cam_noc_0_req_link_misrprb_MiscCtl_Low */