samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Código Issues Pull requests Ações Pacotes Projetos Versões Wiki Atividade

Merge "msm: camera: common: Remove return from debugfs_create_bool" into camera-kernel.lnx.5.0

Ver código fonte
Esse commit está contido em:
Savita Patted
2021-11-05 18:38:15 -07:00
commit de Gerrit - the friendly Code Review server
pai fd8920f5b8 9716446091
commit 869991d193
7 arquivos alterados com 28 adições e 72 exclusões
Baixar arquivo de patch Baixar arquivo de diferenças Expandir todos os arquivos Colapsar todos os arquivos

13
drivers/cam_cpas/cam_cpas_hw.c
Ver arquivo

@@ -2925,21 +2925,14 @@ static int cam_cpas_util_create_debugfs(struct cam_cpas *cpas_core)
/* Store parent inode for cleanup in caller */
cpas_core->dentry = dbgfileptr;
dbgfileptr = debugfs_create_bool("ahb_bus_scaling_disable", 0644,
debugfs_create_bool("ahb_bus_scaling_disable", 0644,
cpas_core->dentry, &cpas_core->ahb_bus_scaling_disable);
dbgfileptr = debugfs_create_bool("full_state_dump", 0644,
debugfs_create_bool("full_state_dump", 0644,
cpas_core->dentry, &cpas_core->full_state_dump);
dbgfileptr = debugfs_create_bool("smart_qos_dump", 0644,
debugfs_create_bool("smart_qos_dump", 0644,
cpas_core->dentry, &cpas_core->smart_qos_dump);
if (IS_ERR(dbgfileptr)) {
if (PTR_ERR(dbgfileptr) == -ENODEV)
CAM_WARN(CAM_CPAS, "DebugFS not enabled in kernel!");
else
rc = PTR_ERR(dbgfileptr);
}
end:
return rc;
}

23
drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c
Ver arquivo

@@ -1934,36 +1934,29 @@ static int cam_icp_hw_mgr_create_debugfs_entry(void)
/* Store parent inode for cleanup in caller */
icp_hw_mgr.dentry = dbgfileptr;
dbgfileptr = debugfs_create_bool("icp_pc", 0644, icp_hw_mgr.dentry,
debugfs_create_bool("icp_pc", 0644, icp_hw_mgr.dentry,
&icp_hw_mgr.icp_pc_flag);
dbgfileptr = debugfs_create_bool("ipe_bps_pc", 0644, icp_hw_mgr.dentry,
debugfs_create_bool("ipe_bps_pc", 0644, icp_hw_mgr.dentry,
&icp_hw_mgr.ipe_bps_pc_flag);
dbgfileptr = debugfs_create_file("icp_debug_clk", 0644,
debugfs_create_file("icp_debug_clk", 0644,
icp_hw_mgr.dentry, NULL, &cam_icp_debug_default_clk);
dbgfileptr = debugfs_create_bool("icp_jtag_debug", 0644,
debugfs_create_bool("icp_jtag_debug", 0644,
icp_hw_mgr.dentry, &icp_hw_mgr.icp_jtag_debug);
dbgfileptr = debugfs_create_file("icp_debug_type", 0644,
debugfs_create_file("icp_debug_type", 0644,
icp_hw_mgr.dentry, NULL, &cam_icp_debug_type_fs);
dbgfileptr = debugfs_create_file("icp_debug_lvl", 0644,
debugfs_create_file("icp_debug_lvl", 0644,
icp_hw_mgr.dentry, NULL, &cam_icp_debug_fs);
dbgfileptr = debugfs_create_file("icp_fw_dump_lvl", 0644,
debugfs_create_file("icp_fw_dump_lvl", 0644,
icp_hw_mgr.dentry, NULL, &cam_icp_debug_fw_dump);
dbgfileptr = debugfs_create_bool("disable_ubwc_comp", 0644,
debugfs_create_bool("disable_ubwc_comp", 0644,
icp_hw_mgr.dentry, &icp_hw_mgr.disable_ubwc_comp);
if (IS_ERR(dbgfileptr)) {
if (PTR_ERR(dbgfileptr) == -ENODEV)
CAM_WARN(CAM_ICP, "DebugFS not enabled in kernel!");
else
rc = PTR_ERR(dbgfileptr);
}
end:
/* Set default hang dump lvl */
icp_hw_mgr.icp_fw_dump_lvl = HFI_FW_DUMP_ON_FAILURE;

25
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
Ver arquivo

@@ -12680,40 +12680,33 @@ static int cam_ife_hw_mgr_debug_register(void)
/* Store parent inode for cleanup in caller */
g_ife_hw_mgr.debug_cfg.dentry = dbgfileptr;
dbgfileptr = debugfs_create_file("ife_csid_debug", 0644,
debugfs_create_file("ife_csid_debug", 0644,
g_ife_hw_mgr.debug_cfg.dentry, NULL, &cam_ife_csid_debug);
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,
debugfs_create_bool("enable_req_dump", 0644,
g_ife_hw_mgr.debug_cfg.dentry,
&g_ife_hw_mgr.debug_cfg.enable_req_dump);
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,
debugfs_create_file("ife_camif_debug", 0644,
g_ife_hw_mgr.debug_cfg.dentry, NULL, &cam_ife_camif_debug);
dbgfileptr = debugfs_create_bool("per_req_reg_dump", 0644,
debugfs_create_bool("per_req_reg_dump", 0644,
g_ife_hw_mgr.debug_cfg.dentry,
&g_ife_hw_mgr.debug_cfg.per_req_reg_dump);
dbgfileptr = debugfs_create_bool("disable_ubwc_comp", 0644,
debugfs_create_bool("disable_ubwc_comp", 0644,
g_ife_hw_mgr.debug_cfg.dentry,
&g_ife_hw_mgr.debug_cfg.disable_ubwc_comp);
dbgfileptr = debugfs_create_file("sfe_debug", 0644,
debugfs_create_file("sfe_debug", 0644,
g_ife_hw_mgr.debug_cfg.dentry, NULL, &cam_ife_sfe_debug);
dbgfileptr = debugfs_create_file("sfe_sensor_diag_sel", 0644,
debugfs_create_file("sfe_sensor_diag_sel", 0644,
g_ife_hw_mgr.debug_cfg.dentry, NULL, &cam_ife_sfe_sensor_diag_debug);
dbgfileptr = debugfs_create_bool("disable_ife_mmu_prefetch", 0644,
debugfs_create_bool("disable_ife_mmu_prefetch", 0644,
g_ife_hw_mgr.debug_cfg.dentry,
&g_ife_hw_mgr.debug_cfg.disable_ife_mmu_prefetch);
dbgfileptr = debugfs_create_file("sfe_cache_debug", 0644,
debugfs_create_file("sfe_cache_debug", 0644,
g_ife_hw_mgr.debug_cfg.dentry, NULL, &cam_ife_sfe_cache_debug);
if (IS_ERR(dbgfileptr)) {
if (PTR_ERR(dbgfileptr) == -ENODEV)
CAM_WARN(CAM_ISP, "DebugFS not enabled in kernel!");
else
rc = PTR_ERR(dbgfileptr);
}
end:
g_ife_hw_mgr.debug_cfg.enable_csid_recovery = 1;
return rc;

8
drivers/cam_req_mgr/cam_mem_mgr.c
Ver arquivo

@@ -179,14 +179,8 @@ static int cam_mem_mgr_create_debug_fs(void)
/* Store parent inode for cleanup in caller */
tbl.dentry = dbgfileptr;
dbgfileptr = debugfs_create_bool("alloc_profile_enable", 0644,
debugfs_create_bool("alloc_profile_enable", 0644,
tbl.dentry, &tbl.alloc_profile_enable);
if (IS_ERR(dbgfileptr)) {
if (PTR_ERR(dbgfileptr) == -ENODEV)
CAM_WARN(CAM_MEM, "DebugFS not enabled in kernel!");
else
rc = PTR_ERR(dbgfileptr);
}
end:
return rc;
}

12
drivers/cam_req_mgr/cam_req_mgr_debug.c
Ver arquivo

@@ -126,20 +126,14 @@ int cam_req_mgr_debug_register(struct cam_req_mgr_core_device *core_dev)
/* Store parent inode for cleanup in caller */
debugfs_root = dbgfileptr;
dbgfileptr = debugfs_create_file("sessions_info", 0644, debugfs_root,
debugfs_create_file("sessions_info", 0644, debugfs_root,
core_dev, &session_info);
dbgfileptr = debugfs_create_file("bubble_recovery", 0644,
debugfs_create_file("bubble_recovery", 0644,
debugfs_root, core_dev, &bubble_recovery);
dbgfileptr = debugfs_create_bool("recovery_on_apply_fail", 0644,
debugfs_create_bool("recovery_on_apply_fail", 0644,
debugfs_root, &core_dev->recovery_on_apply_fail);
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!");
else
rc = PTR_ERR(dbgfileptr);
}
end:
return rc;
}

10
drivers/cam_smmu/cam_smmu_api.c
Ver arquivo

@@ -4461,16 +4461,10 @@ static int cam_smmu_create_debug_fs(void)
/* Store parent inode for cleanup in caller */
iommu_cb_set.dentry = dbgfileptr;
dbgfileptr = debugfs_create_bool("cb_dump_enable", 0644,
debugfs_create_bool("cb_dump_enable", 0644,
iommu_cb_set.dentry, &iommu_cb_set.cb_dump_enable);
dbgfileptr = debugfs_create_bool("map_profile_enable", 0644,
debugfs_create_bool("map_profile_enable", 0644,
iommu_cb_set.dentry, &iommu_cb_set.map_profile_enable);
if (IS_ERR(dbgfileptr)) {
if (PTR_ERR(dbgfileptr) == -ENODEV)
CAM_WARN(CAM_SMMU, "DebugFS not enabled in kernel!");
else
rc = PTR_ERR(dbgfileptr);
}
end:
return rc;
}

9
drivers/cam_sync/cam_sync.c
Ver arquivo

@@ -1077,14 +1077,9 @@ static int cam_sync_create_debugfs(void)
/* Store parent inode for cleanup in caller */
sync_dev->dentry = dbgfileptr;
dbgfileptr = debugfs_create_bool("trigger_cb_without_switch", 0644,
debugfs_create_bool("trigger_cb_without_switch", 0644,
sync_dev->dentry, &trigger_cb_without_switch);
if (IS_ERR(dbgfileptr)) {
if (PTR_ERR(dbgfileptr) == -ENODEV)
CAM_WARN(CAM_SYNC, "DebugFS not enabled in kernel!");
else
rc = PTR_ERR(dbgfileptr);
}
end:
return rc;
}