Merge "msm: camera: req_mgr: Debugfs API update" into camera-kernel.lnx.5.0

drivers/cam_isp/cam_isp_context.c

@@ -6114,9 +6114,9 @@ static int cam_isp_context_debug_register(void)
 	/* Store parent inode for cleanup in caller */
 	isp_ctx_debug.dentry = dbgfileptr;
 
-	dbgfileptr = debugfs_create_u32("enable_state_monitor_dump", 0644,
+	debugfs_create_u32("enable_state_monitor_dump", 0644,
 		isp_ctx_debug.dentry, &isp_ctx_debug.enable_state_monitor_dump);
-	dbgfileptr = debugfs_create_u8("enable_cdm_cmd_buffer_dump", 0644,
+	debugfs_create_u8("enable_cdm_cmd_buffer_dump", 0644,
 		isp_ctx_debug.dentry, &isp_ctx_debug.enable_cdm_cmd_buff_dump);
 	if (IS_ERR(dbgfileptr)) {
 		if (PTR_ERR(dbgfileptr) == -ENODEV)

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

@@ -10800,13 +10800,12 @@ static int cam_ife_hw_mgr_debug_register(void)
 
 	dbgfileptr = debugfs_create_file("ife_csid_debug", 0644,
 		g_ife_hw_mgr.debug_cfg.dentry, NULL, &cam_ife_csid_debug);
-	dbgfileptr = debugfs_create_u32("enable_recovery", 0644,
-		g_ife_hw_mgr.debug_cfg.dentry,
+	debugfs_create_u32("enable_recovery", 0644, g_ife_hw_mgr.debug_cfg.dentry,
 		&g_ife_hw_mgr.debug_cfg.enable_recovery);
 	dbgfileptr = debugfs_create_bool("enable_req_dump", 0644,
 		g_ife_hw_mgr.debug_cfg.dentry,
 		&g_ife_hw_mgr.debug_cfg.enable_req_dump);
-	dbgfileptr = debugfs_create_u32("enable_csid_recovery", 0644,
+	debugfs_create_u32("enable_csid_recovery", 0644,
 		g_ife_hw_mgr.debug_cfg.dentry,
 		&g_ife_hw_mgr.debug_cfg.enable_csid_recovery);
 	dbgfileptr = debugfs_create_file("ife_camif_debug", 0644,

drivers/cam_req_mgr/cam_req_mgr_debug.c

@@ -132,8 +132,8 @@ int cam_req_mgr_debug_register(struct cam_req_mgr_core_device *core_dev)
 		debugfs_root, core_dev, &bubble_recovery);
 	dbgfileptr = debugfs_create_bool("recovery_on_apply_fail", 0644,
 		debugfs_root, &core_dev->recovery_on_apply_fail);
-	dbgfileptr = debugfs_create_u32("delay_detect_count", 0644,
-		debugfs_root, &cam_debug_mgr_delay_detect);
+	debugfs_create_u32("delay_detect_count", 0644, debugfs_root,
+		&cam_debug_mgr_delay_detect);
 	if (IS_ERR(dbgfileptr)) {
 		if (PTR_ERR(dbgfileptr) == -ENODEV)
 			CAM_WARN(CAM_MEM, "DebugFS not enabled in kernel!");