Skip to content

Commit

Permalink
FIXUP: debugfs_create_bool doesn't return a value
Browse files Browse the repository at this point in the history
Change-Id: I2f015297d1cdff05990428e4d2fb0203fbbb58d7
  • Loading branch information
Lukasz Majczak committed Jul 20, 2021
1 parent 69d26db commit 59a72b0
Showing 5 changed files with 17 additions and 64 deletions.
17 changes: 3 additions & 14 deletions drivers/media/platform/camx/cam_cdm/cam_cdm_hw_core.c
Original file line number Diff line number Diff line change
@@ -72,27 +72,16 @@ static int cam_hw_cdm_bl_fifo_pending_bl_rb(struct cam_hw_info *cdm_hw,

static int cam_hw_cdm_create_debugfs_entry(void)
{
int rc = 0;

debugfs_entry.dentry = debugfs_create_dir("camera_cdm", NULL);
if (!debugfs_entry.dentry)
return -ENOMEM;

if (!debugfs_create_bool("dump_register",
debugfs_create_bool("dump_register",
0644,
debugfs_entry.dentry,
&debugfs_entry.dump_register)) {
CAM_ERR(CAM_CDM,
"failed to create dump_register entry");
rc = -ENOMEM;
goto err;
}
&debugfs_entry.dump_register);

return rc;
err:
debugfs_remove_recursive(debugfs_entry.dentry);
debugfs_entry.dentry = NULL;
return rc;
return 0;
}

static int cam_hw_cdm_enable_bl_done_irq(struct cam_hw_info *cdm_hw,
Original file line number Diff line number Diff line change
@@ -1399,23 +1399,15 @@ static int cam_icp_hw_mgr_create_debugfs_entry(void)
if (!icp_hw_mgr.dentry)
return -ENOMEM;

if (!debugfs_create_bool("icp_pc",
debugfs_create_bool("icp_pc",
0644,
icp_hw_mgr.dentry,
&icp_hw_mgr.icp_pc_flag)) {
CAM_ERR(CAM_ICP, "failed to create icp_pc entry");
rc = -ENOMEM;
goto err;
}
&icp_hw_mgr.icp_pc_flag);

if (!debugfs_create_bool("ipe_bps_pc",
debugfs_create_bool("ipe_bps_pc",
0644,
icp_hw_mgr.dentry,
&icp_hw_mgr.ipe_bps_pc_flag)) {
CAM_ERR(CAM_ICP, "failed to create ipe_bps_pc entry");
rc = -ENOMEM;
goto err;
}
&icp_hw_mgr.ipe_bps_pc_flag);

if (!debugfs_create_file("icp_debug_clk",
0644,
@@ -1426,13 +1418,10 @@ static int cam_icp_hw_mgr_create_debugfs_entry(void)
goto err;
}

if (!debugfs_create_bool("a5_jtag_debug",
debugfs_create_bool("a5_jtag_debug",
0644,
icp_hw_mgr.dentry,
&icp_hw_mgr.a5_jtag_debug)) {
rc = -ENOMEM;
goto err;
}
&icp_hw_mgr.a5_jtag_debug);

if (!debugfs_create_file("a5_debug_type",
0644,
17 changes: 3 additions & 14 deletions drivers/media/platform/camx/cam_lrme/lrme_hw_mgr/cam_lrme_hw_mgr.c
Original file line number Diff line number Diff line change
@@ -1059,30 +1059,19 @@ static int cam_lrme_mgr_hw_config(void *hw_mgr_priv,

static int cam_lrme_mgr_create_debugfs_entry(void)
{
int rc = 0;

g_lrme_hw_mgr.debugfs_entry.dentry =
debugfs_create_dir("camera_lrme", NULL);
if (!g_lrme_hw_mgr.debugfs_entry.dentry) {
CAM_ERR(CAM_LRME, "failed to create dentry");
return -ENOMEM;
}

if (!debugfs_create_bool("dump_register",
debugfs_create_bool("dump_register",
0644,
g_lrme_hw_mgr.debugfs_entry.dentry,
&g_lrme_hw_mgr.debugfs_entry.dump_register)) {
CAM_ERR(CAM_LRME, "failed to create dump register entry");
rc = -ENOMEM;
goto err;
}
&g_lrme_hw_mgr.debugfs_entry.dump_register);

return rc;

err:
debugfs_remove_recursive(g_lrme_hw_mgr.debugfs_entry.dentry);
g_lrme_hw_mgr.debugfs_entry.dentry = NULL;
return rc;
return 0;
}


16 changes: 3 additions & 13 deletions drivers/media/platform/camx/cam_smmu/cam_smmu_api.c
Original file line number Diff line number Diff line change
@@ -246,26 +246,16 @@ static void cam_smmu_page_fault_work(struct work_struct *work)

static int cam_smmu_create_debugfs_entry(void)
{
int rc = 0;

smmu_dentry = debugfs_create_dir("camera_smmu", NULL);
if (!smmu_dentry)
return -ENOMEM;

if (!debugfs_create_bool("cam_smmu_fatal",
debugfs_create_bool("cam_smmu_fatal",
0644,
smmu_dentry,
&smmu_fatal_flag)) {
CAM_ERR(CAM_SMMU, "failed to create cam_smmu_fatal entry");
rc = -ENOMEM;
goto err;
}
&smmu_fatal_flag);

return rc;
err:
debugfs_remove_recursive(smmu_dentry);
smmu_dentry = NULL;
return rc;
return 0;
}

static void cam_smmu_print_user_list(int idx)
8 changes: 2 additions & 6 deletions drivers/media/platform/camx/cam_sync/cam_sync.c
Original file line number Diff line number Diff line change
@@ -1003,13 +1003,9 @@ static int cam_sync_create_debugfs(void)
return -ENOMEM;
}

if (!debugfs_create_bool("trigger_cb_without_switch",
debugfs_create_bool("trigger_cb_without_switch",
0644, sync_dev->dentry,
&trigger_cb_without_switch)) {
CAM_ERR(CAM_SYNC,
"failed to create trigger_cb_without_switch entry");
return -ENOMEM;
}
&trigger_cb_without_switch);

return 0;
}

0 comments on commit 59a72b0

Please sign in to comment.