From 425df29bb658e5e6720c675cbbf85abcac9a5827 Mon Sep 17 00:00:00 2001 From: Jeykumar Sankaran Date: Tue, 5 Oct 2021 20:51:38 -0700 Subject: [PATCH] disp: msm: sde: avoid checking debugfs_create_bool return value Adapt 5.15 kernel upstream change to return void for debugfs_create_bool. Change-Id: I9f2ece04dddeba8f43d603fbb62517ea5fb48e7c Signed-off-by: Jeykumar Sankaran --- msm/dsi/dsi_ctrl.c | 12 +----------- msm/dsi/dsi_display.c | 32 ++++++-------------------------- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/msm/dsi/dsi_ctrl.c b/msm/dsi/dsi_ctrl.c index fb20770728..50c4f3073f 100644 --- a/msm/dsi/dsi_ctrl.c +++ b/msm/dsi/dsi_ctrl.c @@ -297,17 +297,7 @@ static int dsi_ctrl_debugfs_init(struct dsi_ctrl *dsi_ctrl, goto error_remove_dir; } - cmd_dma_logs = debugfs_create_bool("enable_cmd_dma_stats", - 0600, - dir, - &dsi_ctrl->enable_cmd_dma_stats); - if (IS_ERR_OR_NULL(cmd_dma_logs)) { - rc = PTR_ERR(cmd_dma_logs); - DSI_CTRL_ERR(dsi_ctrl, - "enable cmd dma stats failed, rc=%d\n", - rc); - goto error_remove_dir; - } + debugfs_create_bool("enable_cmd_dma_stats", 0600, dir, &dsi_ctrl->enable_cmd_dma_stats); cmd_dma_logs = debugfs_create_file("cmd_dma_stats", 0444, diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c index eb68770b9c..1288d19e9c 100644 --- a/msm/dsi/dsi_display.c +++ b/msm/dsi/dsi_display.c @@ -2007,40 +2007,20 @@ static int dsi_display_debugfs_init(struct dsi_display *display) snprintf(name, ARRAY_SIZE(name), "%s_allow_phy_power_off", phy->name); - dump_file = debugfs_create_bool(name, 0600, dir, - &phy->allow_phy_power_off); - 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_bool(name, 0600, dir, &phy->allow_phy_power_off); snprintf(name, ARRAY_SIZE(name), "%s_regulator_min_datarate_bps", phy->name); debugfs_create_u32(name, 0600, dir, &phy->regulator_min_datarate_bps); } - if (!debugfs_create_bool("ulps_feature_enable", 0600, dir, - &display->panel->ulps_feature_enabled)) { - DSI_ERR("[%s] debugfs create ulps feature enable file failed\n", - display->name); - goto error_remove_dir; - } + debugfs_create_bool("ulps_feature_enable", 0600, dir, + &display->panel->ulps_feature_enabled); - if (!debugfs_create_bool("ulps_suspend_feature_enable", 0600, dir, - &display->panel->ulps_suspend_enabled)) { - DSI_ERR("[%s] debugfs create ulps-suspend feature enable file failed\n", - display->name); - goto error_remove_dir; - } + debugfs_create_bool("ulps_suspend_feature_enable", 0600, dir, + &display->panel->ulps_suspend_enabled); - if (!debugfs_create_bool("ulps_status", 0400, dir, - &display->ulps_enabled)) { - DSI_ERR("[%s] debugfs create ulps status file failed\n", - display->name); - goto error_remove_dir; - } + debugfs_create_bool("ulps_status", 0400, dir, &display->ulps_enabled); debugfs_create_u32("clk_gating_config", 0600, dir, &display->clk_gating_config);