* [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver @ 2021-03-05 19:17 Abhinav Kumar 2021-03-05 19:17 ` [PATCH 2/3] drm/msm/dp: Fix incorrect NULL check " Abhinav Kumar ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Abhinav Kumar @ 2021-03-05 19:17 UTC (permalink / raw) To: dri-devel Cc: linux-arm-msm, Abhinav Kumar, swboyd, khsieh, seanpaul, tanmay, aravindh, freedreno, dan.carpenter Fix a couple of indentation warnings reported by kbot across MSM DP driver: New smatch warnings: drivers/gpu/drm/msm/dp/dp_debug.c:229 dp_test_data_show() warn: inconsistent indenting drivers/gpu/drm/msm/dp/dp_power.c:203 dp_power_clk_enable() warn: inconsistent indenting 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 | 2 +- drivers/gpu/drm/msm/dp/dp_power.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c index 84670bc..6c6998f 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"); 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; } if (pm_type == DP_CORE_PM) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] drm/msm/dp: Fix incorrect NULL check kbot warnings in DP driver 2021-03-05 19:17 [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver Abhinav Kumar @ 2021-03-05 19:17 ` Abhinav Kumar 2021-03-26 1:17 ` Stephen Boyd 2021-03-05 19:17 ` [PATCH 3/3] drm/msm/dp: delete unnecessary debugfs error handling Abhinav Kumar 2021-03-26 1:17 ` [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver Stephen Boyd 2 siblings, 1 reply; 6+ messages in thread From: Abhinav Kumar @ 2021-03-05 19:17 UTC (permalink / raw) To: dri-devel Cc: linux-arm-msm, Abhinav Kumar, swboyd, khsieh, seanpaul, tanmay, aravindh, freedreno, dan.carpenter Fix an incorrect NULL check reported by kbot in the MSM DP driver smatch warnings: drivers/gpu/drm/msm/dp/dp_hpd.c:37 dp_hpd_connect() error: we previously assumed 'hpd_priv->dp_cb' could be null (see line 37) 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_hpd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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) { pr_err("hpd dp_cb not initialized\n"); return -EINVAL; } -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] drm/msm/dp: Fix incorrect NULL check kbot warnings in DP driver 2021-03-05 19:17 ` [PATCH 2/3] drm/msm/dp: Fix incorrect NULL check " Abhinav Kumar @ 2021-03-26 1:17 ` Stephen Boyd 0 siblings, 0 replies; 6+ messages in thread From: Stephen Boyd @ 2021-03-26 1:17 UTC (permalink / raw) To: Abhinav Kumar, dri-devel Cc: linux-arm-msm, Abhinav Kumar, khsieh, seanpaul, tanmay, aravindh, freedreno, dan.carpenter Quoting Abhinav Kumar (2021-03-05 11:17:18) > Fix an incorrect NULL check reported by kbot in the MSM DP driver > > smatch warnings: > drivers/gpu/drm/msm/dp/dp_hpd.c:37 dp_hpd_connect() > error: we previously assumed 'hpd_priv->dp_cb' could be null > (see line 37) > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] drm/msm/dp: delete unnecessary debugfs error handling 2021-03-05 19:17 [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver Abhinav Kumar 2021-03-05 19:17 ` [PATCH 2/3] drm/msm/dp: Fix incorrect NULL check " Abhinav Kumar @ 2021-03-05 19:17 ` Abhinav Kumar 2021-03-26 1:18 ` Stephen Boyd 2021-03-26 1:17 ` [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver Stephen Boyd 2 siblings, 1 reply; 6+ messages in thread From: Abhinav Kumar @ 2021-03-05 19:17 UTC (permalink / raw) To: dri-devel Cc: linux-arm-msm, Abhinav Kumar, swboyd, khsieh, seanpaul, tanmay, aravindh, freedreno, dan.carpenter Currently the error checking logic in the dp_debug module could pass zero to PTR_ERR and it causes the below kbot warnings: drivers/gpu/drm/msm/dp/dp_debug.c:378 dp_debug_init() warn: passing zero to 'PTR_ERR' drivers/gpu/drm/msm/dp/dp_debug.c:387 dp_debug_init() warn: passing zero to 'PTR_ERR' drivers/gpu/drm/msm/dp/dp_debug.c:396 dp_debug_init() warn: passing zero to 'PTR_ERR' drivers/gpu/drm/msm/dp/dp_debug.c:405 dp_debug_init() warn: passing zero to 'PTR_ERR' Debugfs functions are not supposed to be checked in the normal case so delete this code. Also it silences the above Smatch warnings that we're checking for NULL when these functions only return error pointers. 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 | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_debug.c b/drivers/gpu/drm/msm/dp/dp_debug.c index 6c6998f..2f6247e 100644 --- a/drivers/gpu/drm/msm/dp/dp_debug.c +++ b/drivers/gpu/drm/msm/dp/dp_debug.c @@ -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); - } debug->root = minor->debugfs_root; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] drm/msm/dp: delete unnecessary debugfs error handling 2021-03-05 19:17 ` [PATCH 3/3] drm/msm/dp: delete unnecessary debugfs error handling Abhinav Kumar @ 2021-03-26 1:18 ` Stephen Boyd 0 siblings, 0 replies; 6+ messages in thread From: Stephen Boyd @ 2021-03-26 1:18 UTC (permalink / raw) To: Abhinav Kumar, dri-devel Cc: linux-arm-msm, Abhinav Kumar, khsieh, seanpaul, tanmay, aravindh, freedreno, dan.carpenter Quoting Abhinav Kumar (2021-03-05 11:17:19) > Currently the error checking logic in the dp_debug module could > pass zero to PTR_ERR and it causes the below kbot warnings: > > drivers/gpu/drm/msm/dp/dp_debug.c:378 dp_debug_init() > warn: passing zero to 'PTR_ERR' > drivers/gpu/drm/msm/dp/dp_debug.c:387 dp_debug_init() > warn: passing zero to 'PTR_ERR' > drivers/gpu/drm/msm/dp/dp_debug.c:396 dp_debug_init() > warn: passing zero to 'PTR_ERR' > drivers/gpu/drm/msm/dp/dp_debug.c:405 dp_debug_init() > warn: passing zero to 'PTR_ERR' > > Debugfs functions are not supposed to be checked in the normal > case so delete this code. Also it silences the above Smatch > warnings that we're checking for NULL when these functions only > return error pointers. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> Nice cleanup! _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver 2021-03-05 19:17 [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver Abhinav Kumar 2021-03-05 19:17 ` [PATCH 2/3] drm/msm/dp: Fix incorrect NULL check " Abhinav Kumar 2021-03-05 19:17 ` [PATCH 3/3] drm/msm/dp: delete unnecessary debugfs error handling Abhinav Kumar @ 2021-03-26 1:17 ` Stephen Boyd 2 siblings, 0 replies; 6+ messages in thread From: Stephen Boyd @ 2021-03-26 1:17 UTC (permalink / raw) To: Abhinav Kumar, dri-devel Cc: linux-arm-msm, Abhinav Kumar, khsieh, seanpaul, tanmay, aravindh, freedreno, dan.carpenter Quoting Abhinav Kumar (2021-03-05 11:17:17) > Fix a couple of indentation warnings reported by > kbot across MSM DP driver: > > New smatch warnings: > drivers/gpu/drm/msm/dp/dp_debug.c:229 dp_test_data_show() > warn: inconsistent indenting > > drivers/gpu/drm/msm/dp/dp_power.c:203 dp_power_clk_enable() > warn: inconsistent indenting > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-26 1:18 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-03-05 19:17 [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver Abhinav Kumar 2021-03-05 19:17 ` [PATCH 2/3] drm/msm/dp: Fix incorrect NULL check " Abhinav Kumar 2021-03-26 1:17 ` Stephen Boyd 2021-03-05 19:17 ` [PATCH 3/3] drm/msm/dp: delete unnecessary debugfs error handling Abhinav Kumar 2021-03-26 1:18 ` Stephen Boyd 2021-03-26 1:17 ` [PATCH 1/3] drm/msm/dp: Fix indentation kbot warnings in DP driver Stephen Boyd
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).