Browse Source

disp: msm: remove debugfs_create_u32 return value

Commit 2b07021a940c ("debugfs: remove return value
of debugfs_create_u32()") removes the return value
from debugfs_create_u32. This change updates the msm
driver to remove cehcks on this return and corrects
for unnecessary line wraps.

Change-Id: I8d50dd7168921edfb2d5edad13941f91117d3c30
Signed-off-by: Samantha Tran <[email protected]>
Signed-off-by: Nilaan Gunabalachandran <[email protected]>
Samantha Tran 4 năm trước cách đây
mục cha
commit
e199ecbfb8

+ 5 - 32
msm/dp/dp_debug.c

@@ -1975,32 +1975,11 @@ static int dp_debug_init_link(struct dp_debug_private *debug,
 		return rc;
 	}
 
-	file = debugfs_create_u32("max_lclk_khz", 0644, dir,
-			&debug->parser->max_lclk_khz);
-	if (IS_ERR_OR_NULL(file)) {
-		rc = PTR_ERR(file);
-		DP_ERR("[%s] debugfs max_lclk_khz failed, rc=%d\n",
-		       DEBUG_NAME, rc);
-		return rc;
-	}
+	debugfs_create_u32("max_lclk_khz", 0644, dir, &debug->parser->max_lclk_khz);
 
-	file = debugfs_create_u32("lane_count", 0644, dir,
-			&debug->panel->lane_count);
-	if (IS_ERR_OR_NULL(file)) {
-		rc = PTR_ERR(file);
-		DP_ERR("[%s] debugfs lane_count failed, rc=%d\n",
-		       DEBUG_NAME, rc);
-		return rc;
-	}
+	debugfs_create_u32("lane_count", 0644, dir, &debug->panel->lane_count);
 
-	file = debugfs_create_u32("link_bw_code", 0644, dir,
-			&debug->panel->link_bw_code);
-	if (IS_ERR_OR_NULL(file)) {
-		rc = PTR_ERR(file);
-		DP_ERR("[%s] debugfs link_bw_code failed, rc=%d\n",
-		       DEBUG_NAME, rc);
-		return rc;
-	}
+	debugfs_create_u32("link_bw_code", 0644, dir, &debug->panel->link_bw_code);
 
 	return rc;
 }
@@ -2294,14 +2273,8 @@ static int dp_debug_init_configs(struct dp_debug_private *debug,
 	debug->dp_debug.connect_notification_delay_ms =
 		DEFAULT_CONNECT_NOTIFICATION_DELAY_MS;
 
-	file = debugfs_create_u32("disconnect_delay_ms", 0644, dir,
-		&debug->dp_debug.disconnect_delay_ms);
-	if (IS_ERR_OR_NULL(file)) {
-		rc = PTR_ERR(file);
-		DP_ERR("[%s] debugfs disconnect_delay_ms failed, rc=%d\n",
-		       DEBUG_NAME, rc);
-		return rc;
-	}
+	debugfs_create_u32("disconnect_delay_ms", 0644, dir, &debug->dp_debug.disconnect_delay_ms);
+
 	debug->dp_debug.disconnect_delay_ms = DEFAULT_DISCONNECT_DELAY_MS;
 
 	return rc;

+ 2 - 14
msm/dsi/dsi_display.c

@@ -1933,14 +1933,7 @@ static int dsi_display_debugfs_init(struct dsi_display *display)
 
 		snprintf(name, ARRAY_SIZE(name),
 				"%s_regulator_min_datarate_bps", phy->name);
-		dump_file = debugfs_create_u32(name, 0600, dir,
-				&phy->regulator_min_datarate_bps);
-		if (IS_ERR_OR_NULL(dump_file)) {
-			rc = PTR_ERR(dump_file);
-			DSI_ERR("[%s] debugfs create %s failed, rc=%d\n",
-			       display->name, name, rc);
-			goto error_remove_dir;
-		}
+		debugfs_create_u32(name, 0600, dir, &phy->regulator_min_datarate_bps);
 	}
 
 	if (!debugfs_create_bool("ulps_feature_enable", 0600, dir,
@@ -1964,12 +1957,7 @@ static int dsi_display_debugfs_init(struct dsi_display *display)
 		goto error_remove_dir;
 	}
 
-	if (!debugfs_create_u32("clk_gating_config", 0600, dir,
-			&display->clk_gating_config)) {
-		DSI_ERR("[%s] debugfs create clk gating config failed\n",
-		       display->name);
-		goto error_remove_dir;
-	}
+	debugfs_create_u32("clk_gating_config", 0600, dir, &display->clk_gating_config);
 
 	display->root = dir;
 	dsi_parser_dbg_init(display->parser, dir);

+ 1 - 5
msm/sde/sde_encoder_phys_wb.c

@@ -1769,11 +1769,7 @@ static int sde_encoder_phys_wb_init_debugfs(
 	if (!phys_enc || !wb_enc->hw_wb || !debugfs_root)
 		return -EINVAL;
 
-	if (!debugfs_create_u32("wbdone_timeout", 0600,
-			debugfs_root, &wb_enc->wbdone_timeout)) {
-		SDE_ERROR("failed to create debugfs/wbdone_timeout\n");
-		return -ENOMEM;
-	}
+	debugfs_create_u32("wbdone_timeout", 0600, debugfs_root, &wb_enc->wbdone_timeout);
 
 	return 0;
 }

+ 9 - 50
rotator/sde_rotator_debug.c

@@ -876,11 +876,7 @@ static int sde_rotator_base_create_debugfs(
 		struct sde_rot_data_type *mdata,
 		struct dentry *debugfs_root)
 {
-	if (!debugfs_create_u32("iommu_ref_cnt", 0444,
-			debugfs_root, &mdata->iommu_ref_cnt)) {
-		SDEROT_WARN("failed to create debugfs iommu ref cnt\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("iommu_ref_cnt", 0444, debugfs_root, &mdata->iommu_ref_cnt);
 
 	mdata->clk_always_on = false;
 	if (!debugfs_create_bool("clk_always_on", 0644,
@@ -903,23 +899,11 @@ static int sde_rotator_core_create_debugfs(
 {
 	int ret;
 
-	if (!debugfs_create_u32("hwacquire_timeout", 0400,
-			debugfs_root, &mgr->hwacquire_timeout)) {
-		SDEROT_WARN("failed to create debugfs hw acquire timeout\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("hwacquire_timeout", 0400, debugfs_root, &mgr->hwacquire_timeout);
 
-	if (!debugfs_create_u32("ppc_numer", 0644,
-			debugfs_root, &mgr->pixel_per_clk.numer)) {
-		SDEROT_WARN("failed to create debugfs ppc numerator\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("ppc_numer", 0644, debugfs_root, &mgr->pixel_per_clk.numer);
 
-	if (!debugfs_create_u32("ppc_denom", 0600,
-			debugfs_root, &mgr->pixel_per_clk.denom)) {
-		SDEROT_WARN("failed to create debugfs ppc denominator\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("ppc_denom", 0600, debugfs_root, &mgr->pixel_per_clk.denom);
 
 	if (!debugfs_create_u64("enable_bw_vote", 0644,
 			debugfs_root, &mgr->enable_bw_vote)) {
@@ -1296,40 +1280,15 @@ struct dentry *sde_rotator_create_debugfs(
 		return NULL;
 	}
 
-	if (!debugfs_create_u32("fence_timeout", 0400,
-			debugfs_root, &rot_dev->fence_timeout)) {
-		SDEROT_ERR("fail create fence_timeout\n");
-		debugfs_remove_recursive(debugfs_root);
-		return NULL;
-	}
+	debugfs_create_u32("fence_timeout", 0400, debugfs_root, &rot_dev->fence_timeout);
 
-	if (!debugfs_create_u32("open_timeout", 0400,
-			debugfs_root, &rot_dev->open_timeout)) {
-		SDEROT_ERR("fail create open_timeout\n");
-		debugfs_remove_recursive(debugfs_root);
-		return NULL;
-	}
+	debugfs_create_u32("open_timeout", 0400, debugfs_root, &rot_dev->open_timeout);
 
-	if (!debugfs_create_u32("disable_syscache", 0400,
-			debugfs_root, &rot_dev->disable_syscache)) {
-		SDEROT_ERR("fail create disable_syscache\n");
-		debugfs_remove_recursive(debugfs_root);
-		return NULL;
-	}
+	debugfs_create_u32("disable_syscache", 0400, debugfs_root, &rot_dev->disable_syscache);
 
-	if (!debugfs_create_u32("streamoff_timeout", 0400,
-			debugfs_root, &rot_dev->streamoff_timeout)) {
-		SDEROT_ERR("fail create streamoff_timeout\n");
-		debugfs_remove_recursive(debugfs_root);
-		return NULL;
-	}
+	debugfs_create_u32("streamoff_timeout", 0400, debugfs_root, &rot_dev->streamoff_timeout);
 
-	if (!debugfs_create_u32("early_submit", 0400,
-			debugfs_root, &rot_dev->early_submit)) {
-		SDEROT_ERR("fail create early_submit\n");
-		debugfs_remove_recursive(debugfs_root);
-		return NULL;
-	}
+	debugfs_create_u32("early_submit", 0400, debugfs_root, &rot_dev->early_submit);
 
 	if (sde_rotator_base_create_debugfs(rot_dev->mdata, debugfs_root)) {
 		SDEROT_ERR("fail create base debugfs\n");

+ 5 - 25
rotator/sde_rotator_r3_debug.c

@@ -38,35 +38,15 @@ int sde_rotator_r3_create_debugfs(struct sde_rot_mgr *mgr,
 		return -EINVAL;
 	}
 
-	if (!debugfs_create_u32("koff_timeout", 0644,
-			debugfs_root, &hw_data->koff_timeout)) {
-		SDEROT_ERR("fail create koff_timeout\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("koff_timeout", 0644, debugfs_root, &hw_data->koff_timeout);
 
-	if (!debugfs_create_u32("vid_trigger", 0644,
-			debugfs_root, &hw_data->vid_trigger)) {
-		SDEROT_ERR("fail create vid_trigger\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("vid_trigger", 0644, debugfs_root, &hw_data->vid_trigger);
 
-	if (!debugfs_create_u32("cmd_trigger", 0644,
-			debugfs_root, &hw_data->cmd_trigger)) {
-		SDEROT_ERR("fail create cmd_trigger\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("cmd_trigger", 0644, debugfs_root, &hw_data->cmd_trigger);
 
-	if (!debugfs_create_u32("sbuf_headroom", 0644,
-			debugfs_root, &hw_data->sbuf_headroom)) {
-		SDEROT_ERR("fail create sbuf_headroom\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("sbuf_headroom", 0644, debugfs_root, &hw_data->sbuf_headroom);
 
-	if (!debugfs_create_u32("solid_fill", 0644,
-			debugfs_root, &hw_data->solid_fill)) {
-		SDEROT_ERR("fail create solid_fill\n");
-		return -EINVAL;
-	}
+	debugfs_create_u32("solid_fill", 0644, debugfs_root, &hw_data->solid_fill);
 
 	return 0;
 }