ソースを参照

msm: camera: sensor: Removing dead code

This change removes some unused variables.

CRs-Fixed: 3394193
Change-Id: I5618f8f485b6b3710aad8172bfef6c6da772db82
Signed-off-by: Atiya Kailany <[email protected]>
Atiya Kailany 2 年 前
コミット
cd228527e7

+ 0 - 2
drivers/cam_sensor_module/cam_cci/cam_cci_core.c

@@ -1607,7 +1607,6 @@ static void cam_cci_write_async_helper(struct work_struct *work)
 	struct cci_device *cci_dev;
 	struct cci_write_async *write_async =
 		container_of(work, struct cci_write_async, work);
-	struct cam_sensor_i2c_reg_setting *i2c_msg;
 	enum cci_i2c_master_t master;
 	struct cam_cci_master_info *cci_master_info;
 
@@ -1616,7 +1615,6 @@ static void cam_cci_write_async_helper(struct work_struct *work)
 		write_async->workq_scheduled_ts,
 		CAM_WORKQ_SCHEDULE_TIME_THRESHOLD);
 	cci_dev = write_async->cci_dev;
-	i2c_msg = &write_async->c_ctrl.cfg.cci_i2c_write_cfg;
 	master = write_async->c_ctrl.cci_info->cci_i2c_master;
 	cci_master_info = &cci_dev->cci_master_info[master];
 

+ 3 - 0
drivers/cam_sensor_module/cam_cci/cam_cci_dev.c

@@ -384,6 +384,9 @@ static int cam_cci_irq_routine(struct v4l2_subdev *sd, u32 status,
 		&cci_dev->soc_info;
 
 	ret = cam_cci_irq(soc_info->irq_num[0], cci_dev);
+	if (ret == IRQ_NONE)
+		CAM_ERR(CAM_CCI, "Interrupt was not handled properly, ret %d", ret);
+
 	*handled = true;
 	return 0;
 }

+ 0 - 18
drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

@@ -1011,7 +1011,6 @@ irqreturn_t cam_csiphy_irq(int irq_num, void *data)
 {
 	struct csiphy_device *csiphy_dev =
 		(struct csiphy_device *)data;
-	struct cam_hw_soc_info *soc_info = NULL;
 	struct csiphy_reg_parms_t *csiphy_reg = NULL;
 	void __iomem *base = NULL;
 
@@ -1020,7 +1019,6 @@ irqreturn_t cam_csiphy_irq(int irq_num, void *data)
 		return IRQ_NONE;
 	}
 
-	soc_info = &csiphy_dev->soc_info;
 	base = csiphy_dev->soc_info.reg_map[0].mem_base;
 	csiphy_reg = csiphy_dev->ctrl_reg->csiphy_reg;
 
@@ -1273,9 +1271,6 @@ int32_t cam_csiphy_config_dev(struct csiphy_device *csiphy_dev,
 	int32_t      rc = 0;
 	uint32_t     lane_enable = 0;
 	uint16_t     i = 0, cfg_size = 0;
-	uint16_t     lane_assign = 0;
-	uint8_t      lane_cnt;
-	int          max_lanes = 0;
 	uint16_t     settle_cnt = 0;
 	uint8_t      skew_cal_enable = 0;
 	uint64_t     intermediate_var;
@@ -1320,7 +1315,6 @@ int32_t cam_csiphy_config_dev(struct csiphy_device *csiphy_dev,
 				reg_array = csiphy_dev->ctrl_reg->csiphy_3ph_reg;
 				cfg_size = csiphy_reg->csiphy_3ph_config_array_size;
 			}
-			max_lanes = CAM_CSIPHY_MAX_CPHY_LANES;
 		} else {
 			/* DPHY combo mode*/
 			if (csiphy_dev->ctrl_reg->csiphy_2ph_combo_mode_reg) {
@@ -1332,20 +1326,17 @@ int32_t cam_csiphy_config_dev(struct csiphy_device *csiphy_dev,
 				cfg_size = csiphy_reg->csiphy_2ph_config_array_size;
 			}
 
-			max_lanes = MAX_LANES;
 		}
 	} else if (csiphy_dev->cphy_dphy_combo_mode) {
 		/* for CPHY and DPHY combo mode selection */
 		if (csiphy_dev->ctrl_reg->csiphy_2ph_3ph_mode_reg) {
 			reg_array = csiphy_dev->ctrl_reg->csiphy_2ph_3ph_mode_reg;
 			cfg_size = csiphy_reg->csiphy_2ph_3ph_config_array_size;
-			max_lanes = CAM_CSIPHY_MAX_CPHY_DPHY_COMBO_LN;
 		} else {
 			reg_array = csiphy_dev->ctrl_reg->csiphy_3ph_reg;
 			cfg_size = csiphy_reg->csiphy_3ph_config_array_size;
 			CAM_WARN(CAM_CSIPHY,
 					"Unsupported configuration, Falling back to CPHY mission mode");
-			max_lanes = CAM_CSIPHY_MAX_CPHY_LANES;
 		}
 	} else {
 		/* for CPHY(3Phase) or DPHY(2Phase) Non combe mode selection */
@@ -1353,19 +1344,15 @@ int32_t cam_csiphy_config_dev(struct csiphy_device *csiphy_dev,
 			CAM_DBG(CAM_CSIPHY,
 				"3phase Non combo mode reg array selected");
 			reg_array = csiphy_dev->ctrl_reg->csiphy_3ph_reg;
-			max_lanes = CAM_CSIPHY_MAX_CPHY_LANES;
 			cfg_size = csiphy_reg->csiphy_3ph_config_array_size;
 		} else {
 			CAM_DBG(CAM_CSIPHY,
 				"2PHASE Non combo mode reg array selected");
 			reg_array = csiphy_dev->ctrl_reg->csiphy_2ph_reg;
 			cfg_size = csiphy_reg->csiphy_2ph_config_array_size;
-			max_lanes = MAX_LANES;
 		}
 	}
 
-	lane_cnt = csiphy_dev->csiphy_info[index].lane_cnt;
-	lane_assign = csiphy_dev->csiphy_info[index].lane_assign;
 	lane_enable = csiphy_dev->csiphy_info[index].lane_enable;
 
 
@@ -1423,7 +1410,6 @@ int32_t cam_csiphy_config_dev(struct csiphy_device *csiphy_dev,
 void cam_csiphy_shutdown(struct csiphy_device *csiphy_dev)
 {
 	struct cam_hw_soc_info *soc_info;
-	struct csiphy_reg_parms_t *csiphy_reg;
 	struct cam_csiphy_param *param;
 	int32_t i = 0;
 	int rc = 0;
@@ -1441,8 +1427,6 @@ void cam_csiphy_shutdown(struct csiphy_device *csiphy_dev)
 			CSIPHY_MAX_INSTANCES_PER_PHY;
 	}
 
-	csiphy_reg = csiphy_dev->ctrl_reg->csiphy_reg;
-
 	if ((csiphy_dev->csiphy_state == CAM_CSIPHY_START) ||
 		csiphy_dev->start_dev_count) {
 		soc_info = &csiphy_dev->soc_info;
@@ -1663,7 +1647,6 @@ int cam_csiphy_util_update_aon_registration(uint32_t phy_idx, uint32_t aon_cam_i
 int cam_csiphy_util_update_aon_ops(
 	bool get_access, uint32_t phy_idx)
 {
-	uint32_t cpas_hdl = 0;
 	struct cam_csiphy_aon_sel_params_t *aon_sel_params;
 	int rc = 0;
 
@@ -1682,7 +1665,6 @@ int cam_csiphy_util_update_aon_ops(
 		return -EINVAL;
 	}
 
-	cpas_hdl = g_phy_data[phy_idx].cpas_handle;
 	aon_sel_params = g_phy_data[phy_idx].aon_sel_param;
 
 	mutex_lock(&main_aon_selection);

+ 0 - 3
drivers/cam_sensor_module/cam_csiphy/cam_csiphy_dev.c

@@ -184,7 +184,6 @@ static void cam_csiphy_subdev_handle_message(struct v4l2_subdev *sd,
 		if (idx >= CSIPHY_MAX_INSTANCES_PER_PHY) {
 			CAM_ERR(CAM_CSIPHY, "Phy session not found %d %d",
 				csiphy_dev->soc_info.index, conn_csid_info->lane_cfg);
-			rc = -EBADR;
 			break;
 		}
 
@@ -205,7 +204,6 @@ static void cam_csiphy_subdev_handle_message(struct v4l2_subdev *sd,
 		if (idx >= CSIPHY_MAX_INSTANCES_PER_PHY) {
 			CAM_ERR(CAM_CSIPHY, "Phy session not found %d %d",
 				csiphy_dev->soc_info.index, drv_info->lane_cfg);
-			rc = -EBADR;
 			break;
 		}
 
@@ -232,7 +230,6 @@ static void cam_csiphy_subdev_handle_message(struct v4l2_subdev *sd,
 		if (idx >= CSIPHY_MAX_INSTANCES_PER_PHY) {
 			CAM_ERR(CAM_CSIPHY, "Phy session not found %d %d",
 				csiphy_dev->soc_info.index, halt_resume_info->lane_cfg);
-			rc = -EBADR;
 			break;
 		}
 

+ 3 - 4
drivers/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c

@@ -289,10 +289,9 @@ int32_t cam_csiphy_parse_dt_info(struct platform_device *pdev,
 		return  rc;
 	}
 
-	rc = of_property_read_u32(soc_info->dev->of_node, "rgltr-enable-sync",
-		&is_regulator_enable_sync);
-	if (rc) {
-		rc = 0;
+	if (of_property_read_u32(soc_info->dev->of_node, "rgltr-enable-sync",
+		&is_regulator_enable_sync)) {
+		/* this is not fatal, overwrite to 0 */
 		is_regulator_enable_sync = 0;
 	}
 

+ 7 - 4
drivers/cam_sensor_module/cam_eeprom/cam_eeprom_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/module.h>
@@ -488,7 +488,6 @@ static int32_t cam_eeprom_parse_memory_map(
 		}
 
 		*num_map += (i2c_random_wr->header.count - 1);
-		cmd_buf += cmd_length_in_bytes / sizeof(int32_t);
 		processed_size +=
 			cmd_length_in_bytes;
 		break;
@@ -506,7 +505,6 @@ static int32_t cam_eeprom_parse_memory_map(
 		map[*num_map].mem.data_type = i2c_cont_rd->header.data_type;
 		map[*num_map].mem.valid_size =
 			i2c_cont_rd->header.count;
-		cmd_buf += cmd_length_in_bytes / sizeof(int32_t);
 		processed_size +=
 			cmd_length_in_bytes;
 		data->num_data += map[*num_map].mem.valid_size;
@@ -549,7 +547,6 @@ static int32_t cam_eeprom_parse_memory_map(
 			map[*num_map].poll.delay = i2c_poll->timeout;
 			map[*num_map].poll.valid_size = 1;
 		}
-		cmd_buf += cmd_length_in_bytes / sizeof(int32_t);
 		processed_size +=
 			cmd_length_in_bytes;
 		break;
@@ -1261,6 +1258,9 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t *e_ctrl, void *arg)
 				return rc;
 			}
 			rc = cam_eeprom_get_cal_data(e_ctrl, csl_packet);
+			if (rc)
+				CAM_WARN(CAM_EEPROM, "failed to get calibration data rc %d", rc);
+
 			vfree(e_ctrl->cal_data.mapdata);
 			vfree(e_ctrl->cal_data.map);
 			e_ctrl->cal_data.num_data = 0;
@@ -1309,6 +1309,9 @@ static int32_t cam_eeprom_pkt_parse(struct cam_eeprom_ctrl_t *e_ctrl, void *arg)
 		}
 
 		rc = cam_eeprom_get_cal_data(e_ctrl, csl_packet);
+		if (rc)
+			CAM_WARN(CAM_EEPROM, "failed to get calibration data rc %d", rc);
+
 		rc = cam_eeprom_power_down(e_ctrl);
 		e_ctrl->cam_eeprom_state = CAM_EEPROM_ACQUIRE;
 		vfree(e_ctrl->cal_data.mapdata);

+ 0 - 3
drivers/cam_sensor_module/cam_flash/cam_flash_core.c

@@ -947,7 +947,6 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
 	struct cam_cmd_buf_desc *cmd_desc = NULL;
 	struct cam_config_dev_cmd config;
 	struct cam_req_mgr_add_request add_req;
-	struct i2c_data_settings *i2c_data = NULL;
 	struct i2c_settings_array *i2c_reg_settings = NULL;
 	struct cam_sensor_power_ctrl_t *power_info = NULL;
 
@@ -1100,7 +1099,6 @@ int cam_flash_i2c_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
 			default:
 				CAM_DBG(CAM_FLASH,
 					"Received initSettings");
-				i2c_data = &(fctrl->i2c_data);
 				i2c_reg_settings =
 					&fctrl->i2c_data.init_settings;
 
@@ -1668,7 +1666,6 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
 			break;
 		}
 		case CAMERA_SENSOR_FLASH_CMD_TYPE_RER: {
-			rc = 0;
 			if (remain_len < sizeof(struct cam_flash_set_rer)) {
 				CAM_ERR(CAM_FLASH, "Not enough buffer");
 				rc = -EINVAL;

+ 6 - 7
drivers/cam_sensor_module/cam_flash/cam_flash_dev.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/module.h>
@@ -445,16 +445,15 @@ static int cam_flash_component_bind(struct device *dev,
 	}
 
 	if (of_find_property(pdev->dev.of_node, "cci-master", NULL)) {
+
 		/* Get CCI master */
-		rc = of_property_read_u32(pdev->dev.of_node, "cci-master",
-			&fctrl->cci_i2c_master);
-		CAM_DBG(CAM_FLASH, "cci-master %d, rc %d",
-			fctrl->cci_i2c_master, rc);
-		if (rc < 0) {
+		if (of_property_read_u32(pdev->dev.of_node, "cci-master",
+			&fctrl->cci_i2c_master)) {
 			/* Set default master 0 */
 			fctrl->cci_i2c_master = MASTER_0;
-			rc = 0;
 		}
+		CAM_DBG(CAM_FLASH, "cci-master %d",
+			fctrl->cci_i2c_master);
 
 		fctrl->io_master_info.master_type = CCI_MASTER;
 		rc = cam_flash_init_default_params(fctrl);

+ 3 - 4
drivers/cam_sensor_module/cam_flash/cam_flash_soc.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/of.h>
@@ -161,12 +162,10 @@ static int32_t cam_get_source_node_info(
 			}
 
 			/* Read operational-current */
-			rc = of_property_read_u32(flash_src_node,
+			if (of_property_read_u32(flash_src_node,
 				"qcom,current-ma",
-				&soc_private->flash_op_current[i]);
-			if (rc) {
+				&soc_private->flash_op_current[i])) {
 				CAM_DBG(CAM_FLASH, "op-current: read failed");
-				rc = 0;
 			}
 
 			/* Read max-duration */

+ 0 - 2
drivers/cam_sensor_module/cam_ois/cam_ois_core.c

@@ -765,7 +765,6 @@ static int cam_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
 	}
 	vfree(vaddr);
 	vaddr = NULL;
-	fw_size = 0;
 	release_firmware(fw);
 
 	rc = request_firmware(&fw, fw_name_coeff, dev);
@@ -812,7 +811,6 @@ static int cam_ois_fw_download(struct cam_ois_ctrl_t *o_ctrl)
 release_firmware:
 	vfree(vaddr);
 	vaddr = NULL;
-	fw_size = 0;
 	release_firmware(fw);
 	return rc;
 }

+ 2 - 4
drivers/cam_sensor_module/cam_res_mgr/cam_res_mgr.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/init.h>
@@ -380,7 +380,7 @@ static int cam_res_mgr_shared_pinctrl_select_state(
 		cam_res->pctrl_res[idx].pstatus = PINCTRL_STATUS_SUSPEND;
 	}
 
-	return 0;
+	return rc;
 }
 
 static int cam_res_mgr_add_device(struct device *dev,
@@ -578,11 +578,9 @@ static void cam_res_mgr_gpio_free(struct device *dev, uint gpio)
 	bool                   need_free = true;
 	int                    dev_num = 0;
 	struct cam_gpio_res   *gpio_res = NULL;
-	bool                   is_shared_gpio = false;
 	bool                   is_shared_pctrl_gpio = false;
 	int                    pctrl_idx = -1;
 
-	is_shared_gpio = cam_res_mgr_gpio_is_in_shared_gpio(gpio);
 	is_shared_pctrl_gpio =
 			cam_res_mgr_gpio_is_in_shared_pctrl_gpio(gpio);
 

+ 3 - 7
drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c

@@ -1644,13 +1644,9 @@ int cam_sensor_power_up(struct cam_sensor_ctrl_t *s_ctrl)
 	}
 
 	if (s_ctrl->bob_pwm_switch) {
-		rc = cam_sensor_bob_pwm_mode_switch(soc_info,
-			s_ctrl->bob_reg_index, true);
-		if (rc) {
-			CAM_WARN(CAM_SENSOR,
-			"BoB PWM setup failed rc: %d", rc);
-			rc = 0;
-		}
+		if (cam_sensor_bob_pwm_mode_switch(soc_info,
+			s_ctrl->bob_reg_index, true))
+			CAM_WARN(CAM_SENSOR, "BoB PWM setup failed");
 	}
 
 	if (s_ctrl->aon_camera_id != NOT_AON_CAM) {

+ 1 - 3
drivers/cam_sensor_module/cam_sensor/cam_sensor_dev.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 "cam_sensor_dev.h"
@@ -318,7 +318,6 @@ static void cam_sensor_i2c_component_unbind(struct device *dev,
 {
 	struct i2c_client         *client = NULL;
 	struct cam_sensor_ctrl_t  *s_ctrl = NULL;
-	struct cam_hw_soc_info    *soc_info = NULL;
 
 	client = container_of(dev, struct i2c_client, dev);
 	if (!client) {
@@ -338,7 +337,6 @@ static void cam_sensor_i2c_component_unbind(struct device *dev,
 	cam_sensor_shutdown(s_ctrl);
 	mutex_unlock(&(s_ctrl->cam_sensor_mutex));
 	cam_unregister_subdev(&(s_ctrl->v4l2_dev_str));
-	soc_info = &s_ctrl->soc_info;
 
 	kfree(s_ctrl->i2c_data.per_frame);
 	kfree(s_ctrl->i2c_data.frame_skip);

+ 5 - 6
drivers/cam_sensor_module/cam_sensor/cam_sensor_soc.c

@@ -216,16 +216,15 @@ static int32_t cam_sensor_driver_get_dt_data(struct cam_sensor_ctrl_t *s_ctrl)
 	}
 
 	if (s_ctrl->io_master_info.master_type == CCI_MASTER) {
+
 		/* Get CCI master */
-		rc = of_property_read_u32(of_node, "cci-master",
-			&s_ctrl->cci_i2c_master);
-		CAM_DBG(CAM_SENSOR, "cci-master %d, rc %d",
-			s_ctrl->cci_i2c_master, rc);
-		if (rc < 0) {
+		if (of_property_read_u32(of_node, "cci-master",
+			&s_ctrl->cci_i2c_master)) {
 			/* Set default master 0 */
 			s_ctrl->cci_i2c_master = MASTER_0;
-			rc = 0;
 		}
+		CAM_DBG(CAM_SENSOR, "cci-master %d",
+			s_ctrl->cci_i2c_master);
 
 		of_parent = of_get_parent(of_node);
 		if (of_property_read_u32(of_parent, "cell-index",

+ 6 - 0
drivers/cam_sensor_module/cam_sensor_io/cam_sensor_cci_i2c.c

@@ -89,12 +89,18 @@ int32_t cam_camera_cci_i2c_read_seq(struct cam_sensor_cci_client *cci_client,
 	cci_ctrl.status = -EFAULT;
 	rc = v4l2_subdev_call(cci_client->cci_subdev,
 		core, ioctl, VIDIOC_MSM_CCI_CFG, &cci_ctrl);
+	if (rc < 0) {
+		CAM_ERR(CAM_SENSOR, "CCI config failed rc = %d", rc);
+		goto end;
+	}
 	rc = cci_ctrl.status;
 	CAM_DBG(CAM_SENSOR, "addr = 0x%x, rc = %d", addr, rc);
 	for (i = 0; i < num_byte; i++) {
 		data[i] = buf[i];
 		CAM_DBG(CAM_SENSOR, "Byte %d: Data: 0x%x\n", i, data[i]);
 	}
+
+end:
 	kfree(buf);
 	return rc;
 }

+ 1 - 6
drivers/cam_sensor_module/cam_sensor_io/cam_sensor_spi.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017-2020, 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 "cam_sensor_spi.h"
@@ -554,8 +554,6 @@ int cam_spi_write_table(struct camera_io_master *client,
 	int i;
 	int rc = -EFAULT;
 	struct cam_sensor_i2c_reg_array *reg_setting;
-	uint16_t client_addr_type;
-	enum camera_sensor_i2c_type addr_type;
 
 	if (!client || !write_setting)
 		return rc;
@@ -567,8 +565,6 @@ int cam_spi_write_table(struct camera_io_master *client,
 		return rc;
 
 	reg_setting = write_setting->reg_setting;
-	client_addr_type = write_setting->addr_type;
-	addr_type = write_setting->addr_type;
 	for (i = 0; i < write_setting->size; i++) {
 		CAM_DBG(CAM_SENSOR, "addr %x data %x",
 			reg_setting->reg_addr, reg_setting->reg_data);
@@ -585,7 +581,6 @@ int cam_spi_write_table(struct camera_io_master *client,
 			usleep_range(write_setting->delay * 1000,
 			(write_setting->delay
 			* 1000) + 1000);
-	addr_type = client_addr_type;
 	return rc;
 }
 

+ 1 - 1
drivers/cam_sensor_module/cam_tpg/tpg_hw/tpg_hw_v_1_0/tpg_hw_v_1_0.c

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "tpg_hw_v_1_0.h"
@@ -174,7 +175,6 @@ static int configure_vc(
 	cam_io_w_mb(stream->hbi,
 			soc_info->reg_map[0].mem_base + tpg_reg->tpg_vc_cfg1);
 
-	val = (1 << tpg_reg->tpg_split_en_shift);
 	cam_io_w_mb(0, soc_info->reg_map[0].mem_base +
 			tpg_reg->tpg_common_gen_cfg);
 

+ 11 - 17
drivers/cam_sensor_module/cam_tpg/tpg_hw/tpg_hw_v_1_3/tpg_hw_v_1_3.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "tpg_hw_v_1_3.h"
@@ -865,11 +865,6 @@ int tpg_1_3_layer_init(struct tpg_hw *hw)
 {
 	int rc = 0;
 	struct dentry *dbgfileptr_parent = NULL;
-	struct dentry *dbgfileptr = NULL;
-	struct dentry *dbgfileptr_shdr = NULL;
-	struct dentry *dfp_shdr_batch = NULL;
-	struct dentry *dfp_shdr_off0 = NULL;
-	struct dentry *dfp_shdr_off1 = NULL;
 	char dir_name[160];
 
 	snprintf(dir_name, sizeof(dir_name), "tpg%d",
@@ -880,17 +875,16 @@ int tpg_1_3_layer_init(struct tpg_hw *hw)
 		CAM_ERR(CAM_TPG, "Debug fs could not create directory");
 		rc = -ENOENT;
 	}
-
-	dbgfileptr      = debugfs_create_file("tpg_xcfa_test", 0644,
-			dbgfileptr_parent, hw, &tpg_1_3_xcfa_test);
-	dbgfileptr_shdr = debugfs_create_file("tpg_shdr_overlap_test", 0644,
-			dbgfileptr_parent, hw, &tpg_1_3_shdr_overlap_test);
-	dfp_shdr_batch  = debugfs_create_file("tpg_shdr_offset_num_batch", 0644,
-			dbgfileptr_parent, hw, &tpg_1_3_shdr_offset_num_batch);
-	dfp_shdr_off0   = debugfs_create_file("tpg_shdr_line_offset0", 0644,
-			dbgfileptr_parent, hw, &tpg_1_3_shdr_line_offset0);
-	dfp_shdr_off1   = debugfs_create_file("tpg_shdr_line_offset1", 0644,
-			dbgfileptr_parent, hw, &tpg_1_3_shdr_line_offset1);
+	debugfs_create_file("tpg_xcfa_test", 0644,
+		dbgfileptr_parent, hw, &tpg_1_3_xcfa_test);
+	debugfs_create_file("tpg_shdr_overlap_test", 0644,
+		dbgfileptr_parent, hw, &tpg_1_3_shdr_overlap_test);
+	debugfs_create_file("tpg_shdr_offset_num_batch", 0644,
+		dbgfileptr_parent, hw, &tpg_1_3_shdr_offset_num_batch);
+	debugfs_create_file("tpg_shdr_line_offset0", 0644,
+		dbgfileptr_parent, hw, &tpg_1_3_shdr_line_offset0);
+	debugfs_create_file("tpg_shdr_line_offset1", 0644,
+		dbgfileptr_parent, hw, &tpg_1_3_shdr_line_offset1);
 	CAM_INFO(CAM_TPG, "Layer init called");
 	return rc;
 }

+ 11 - 22
drivers/cam_sensor_module/cam_tpg/tpg_hw/tpg_hw_v_1_4/tpg_hw_v_1_4.c

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include "tpg_hw_v_1_4.h"
@@ -735,17 +735,12 @@ int tpg_hw_v_1_4_stop(struct tpg_hw *hw, void *data)
 
 int tpg_hw_v_1_4_dump_status(struct tpg_hw *hw, void *data)
 {
-	struct cam_hw_soc_info *soc_info = NULL;
-	struct cam_tpg_ver_1_4_reg_offset *tpg_reg = NULL;
 
 	if (!hw || !hw->hw_info || !hw->hw_info->hw_data) {
 		CAM_ERR(CAM_TPG, "invalid params");
 		return -EINVAL;
 	}
 
-	tpg_reg  = hw->hw_info->hw_data;
-
-	soc_info = hw->soc_info;
 	CAM_DBG(CAM_TPG, "TPG V1.4 HWL status dump");
 
 	return 0;
@@ -870,11 +865,6 @@ int tpg_1_4_layer_init(struct tpg_hw *hw)
 {
 	int rc = 0;
 	struct dentry *dbgfileptr_parent = NULL;
-	struct dentry *dbgfileptr = NULL;
-	struct dentry *dbgfileptr_shdr = NULL;
-	struct dentry *dfp_shdr_batch = NULL;
-	struct dentry *dfp_shdr_off0 = NULL;
-	struct dentry *dfp_shdr_off1 = NULL;
 	char dir_name[160];
 
 	snprintf(dir_name, sizeof(dir_name), "tpg%d",
@@ -885,17 +875,16 @@ int tpg_1_4_layer_init(struct tpg_hw *hw)
 		CAM_ERR(CAM_TPG, "Debug fs could not create directory");
 		rc = -ENOENT;
 	}
-
-	dbgfileptr      = debugfs_create_file("tpg_xcfa_test", 0644,
-			dbgfileptr_parent, hw, &tpg_1_4_xcfa_test);
-	dbgfileptr_shdr = debugfs_create_file("tpg_shdr_overlap_test", 0644,
-			dbgfileptr_parent, hw, &tpg_1_4_shdr_overlap_test);
-	dfp_shdr_batch  = debugfs_create_file("tpg_shdr_offset_num_batch", 0644,
-			dbgfileptr_parent, hw, &tpg_1_4_shdr_offset_num_batch);
-	dfp_shdr_off0   = debugfs_create_file("tpg_shdr_line_offset0", 0644,
-			dbgfileptr_parent, hw, &tpg_1_4_shdr_line_offset0);
-	dfp_shdr_off1   = debugfs_create_file("tpg_shdr_line_offset1", 0644,
-			dbgfileptr_parent, hw, &tpg_1_4_shdr_line_offset1);
+	debugfs_create_file("tpg_xcfa_test", 0644,
+		dbgfileptr_parent, hw, &tpg_1_4_xcfa_test);
+	debugfs_create_file("tpg_shdr_overlap_test", 0644,
+		dbgfileptr_parent, hw, &tpg_1_4_shdr_overlap_test);
+	debugfs_create_file("tpg_shdr_offset_num_batch", 0644,
+		dbgfileptr_parent, hw, &tpg_1_4_shdr_offset_num_batch);
+	debugfs_create_file("tpg_shdr_line_offset0", 0644,
+		dbgfileptr_parent, hw, &tpg_1_4_shdr_line_offset0);
+	debugfs_create_file("tpg_shdr_line_offset1", 0644,
+		dbgfileptr_parent, hw, &tpg_1_4_shdr_line_offset1);
 	CAM_INFO(CAM_TPG, "Layer init called");
 	return rc;
 }