Merge "msm: camera: sensor: Cleaning redundant code" into camera-kernel.lnx.7.0

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_core.c

@@ -631,10 +631,7 @@ static int cam_csiphy_sanitize_lane_cnt(
 			max_supported_lanes = 2;
 	} else if (csiphy_dev->cphy_dphy_combo_mode) {
 		/* 2DPHY + 1CPHY or 2CPHY + 1DPHY */
-		if (csiphy_dev->csiphy_info[index].csiphy_3phase)
-			max_supported_lanes = 2;
-		else
-			max_supported_lanes = 2;
+		max_supported_lanes = 2;
 	} else {
 		/* Mission Mode */
 		if (csiphy_dev->csiphy_info[index].csiphy_3phase)

drivers/cam_sensor_module/cam_flash/cam_flash_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-2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -1818,13 +1818,8 @@ int cam_flash_pmic_pkt_parser(struct cam_flash_ctrl *fctrl, void *arg)
 		if ((csl_packet->header.op_code & 0xFFFFF) ==
 			CAM_FLASH_PACKET_OPCODE_SET_OPS) {
 			add_req.trigger_eof = true;
-			if (flash_data->opcode == CAMERA_SENSOR_FLASH_OP_OFF) {
-				add_req.skip_at_sof = 1;
-				add_req.skip_at_eof = 0;
-			} else {
-				add_req.skip_at_sof = 1;
-				add_req.skip_at_eof = 0;
-			}
+			add_req.skip_at_sof = 1;
+			add_req.skip_at_eof = 0;
 		}
 
 		if (fctrl->bridge_intf.crm_cb &&