Maybe subject could be "Ignore debugfs failures, fix indentation, fix logical error"?
Quoting Abhinav Kumar (2021-03-04 17:31:52)
Fix the warnings reported by kbot across MSM DP driver.
Which warnings? Can you include them? Or at least list the three things that are being fixed in this patch?
Reported-by: kernel test robot lkp@intel.com Reported-by: Dan Carpenter dan.carpenter@oracle.com Signed-off-by: Abhinav Kumar abhinavk@codeaurora.org
drivers/gpu/drm/msm/dp/dp_debug.c | 33 +++++---------------------------- drivers/gpu/drm/msm/dp/dp_hpd.c | 4 ++-- drivers/gpu/drm/msm/dp/dp_power.c | 2 +- 3 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c index 84670bc..2f6247e 100644 --- a/drivers/gpu/drm/msm/dp/dp_debug.c +++ b/drivers/gpu/drm/msm/dp/dp_debug.c @@ -226,7 +226,7 @@ static int dp_test_data_show(struct seq_file *m, void *data) debug->link->test_video.test_h_width); seq_printf(m, "vdisplay: %d\n", debug->link->test_video.test_v_height);
seq_printf(m, "bpc: %u\n",
seq_printf(m, "bpc: %u\n", dp_link_bit_depth_to_bpc(bpc)); } else seq_puts(m, "0");
Indentation.
@@ -368,44 +368,21 @@ static int dp_debug_init(struct dp_debug *dp_debug, struct drm_minor *minor) int rc = 0; struct dp_debug_private *debug = container_of(dp_debug, struct dp_debug_private, dp_debug);
struct dentry *file;struct dentry *test_active;struct dentry *test_data, *test_type;file = debugfs_create_file("dp_debug", 0444, minor->debugfs_root,
debugfs_create_file("dp_debug", 0444, minor->debugfs_root, debug, &dp_debug_fops);
if (IS_ERR_OR_NULL(file)) {rc = PTR_ERR(file);DRM_ERROR("[%s] debugfs create file failed, rc=%d\n",DEBUG_NAME, rc);}test_active = debugfs_create_file("msm_dp_test_active", 0444,
debugfs_create_file("msm_dp_test_active", 0444, minor->debugfs_root, debug, &test_active_fops);
if (IS_ERR_OR_NULL(test_active)) {rc = PTR_ERR(test_active);DRM_ERROR("[%s] debugfs test_active failed, rc=%d\n",DEBUG_NAME, rc);}test_data = debugfs_create_file("msm_dp_test_data", 0444,
debugfs_create_file("msm_dp_test_data", 0444, minor->debugfs_root, debug, &dp_test_data_fops);
if (IS_ERR_OR_NULL(test_data)) {rc = PTR_ERR(test_data);DRM_ERROR("[%s] debugfs test_data failed, rc=%d\n",DEBUG_NAME, rc);}test_type = debugfs_create_file("msm_dp_test_type", 0444,
debugfs_create_file("msm_dp_test_type", 0444, minor->debugfs_root, debug, &dp_test_type_fops);
if (IS_ERR_OR_NULL(test_type)) {rc = PTR_ERR(test_type);DRM_ERROR("[%s] debugfs test_type failed, rc=%d\n",DEBUG_NAME, rc);}
Debugfs failures.
debug->root = minor->debugfs_root;diff --git a/drivers/gpu/drm/msm/dp/dp_hpd.c b/drivers/gpu/drm/msm/dp/dp_hpd.c index 5b8fe3202..e1c90fa 100644 --- a/drivers/gpu/drm/msm/dp/dp_hpd.c +++ b/drivers/gpu/drm/msm/dp/dp_hpd.c @@ -34,8 +34,8 @@ int dp_hpd_connect(struct dp_usbpd *dp_usbpd, bool hpd)
dp_usbpd->hpd_high = hpd;
if (!hpd_priv->dp_cb && !hpd_priv->dp_cb->configure&& !hpd_priv->dp_cb->disconnect) {
if (!hpd_priv->dp_cb || !hpd_priv->dp_cb->configure|| !hpd_priv->dp_cb->disconnect) {
Logical error.
pr_err("hpd dp_cb not initialized\n"); return -EINVAL; }diff --git a/drivers/gpu/drm/msm/dp/dp_power.c b/drivers/gpu/drm/msm/dp/dp_power.c index 9c4ea00..3961ba4 100644 --- a/drivers/gpu/drm/msm/dp/dp_power.c +++ b/drivers/gpu/drm/msm/dp/dp_power.c @@ -269,7 +269,7 @@ int dp_power_clk_enable(struct dp_power *dp_power, DRM_ERROR("failed to '%s' clks for: %s. err=%d\n", enable ? "enable" : "disable", dp_parser_pm_name(pm_type), rc);
return rc;
return rc;
Indentation.
} if (pm_type == DP_CORE_PM)