The patch titled
Subject: drm/msm: remove unlikely() from WARN_ON() conditions
has been removed from the -mm tree. Its filename was
drm-msm-remove-unlikely-from-warn_on-conditions.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Denis Efremov <efremov@xxxxxxxxx>
Subject: drm/msm: remove unlikely() from WARN_ON() conditions
"unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely()
internally.
Link: http://lkml.kernel.org/r/20190829165025.15750-2-efremov@xxxxxxxxx
Signed-off-by: Denis Efremov <efremov@xxxxxxxxx>
Cc: Rob Clark <robdclark@xxxxxxxxx>
Cc: Sean Paul <sean@xxxxxxxxxx>
Cc: Joe Perches <joe@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 4 ++--
drivers/gpu/drm/msm/disp/mdp_format.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c~drm-msm-remove-unlikely-from-warn_on-conditions
+++ a/drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c
@@ -253,7 +253,7 @@ int mdp5_ctl_set_cursor(struct mdp5_ctl
u32 blend_cfg;
struct mdp5_hw_mixer *mixer = pipeline->mixer;
- if (unlikely(WARN_ON(!mixer))) {
+ if (WARN_ON(!mixer)) {
DRM_DEV_ERROR(ctl_mgr->dev->dev, "CTL %d cannot find LM",
ctl->id);
return -EINVAL;
@@ -695,7 +695,7 @@ struct mdp5_ctl_manager *mdp5_ctlm_init(
goto fail;
}
- if (unlikely(WARN_ON(ctl_cfg->count > MAX_CTL))) {
+ if (WARN_ON(ctl_cfg->count > MAX_CTL)) {
DRM_DEV_ERROR(dev->dev, "Increase static pool size to at least %d\n",
ctl_cfg->count);
ret = -ENOSPC;
--- a/drivers/gpu/drm/msm/disp/mdp_format.c~drm-msm-remove-unlikely-from-warn_on-conditions
+++ a/drivers/gpu/drm/msm/disp/mdp_format.c
@@ -174,7 +174,7 @@ const struct msm_format *mdp_get_format(
struct csc_cfg *mdp_get_default_csc_cfg(enum csc_type type)
{
- if (unlikely(WARN_ON(type >= CSC_MAX)))
+ if (WARN_ON(type >= CSC_MAX))
return NULL;
return &csc_convert[type];
_
Patches currently in -mm which might be from efremov@xxxxxxxxx are
checkpatch-check-for-nested-unlikely-calls.patch
xen-events-remove-unlikely-from-warn-condition.patch
fs-remove-unlikely-from-warn_on-condition.patch
wimax-i2400m-remove-unlikely-from-warn-condition.patch
xfs-remove-unlikely-from-warn_on-condition.patch
ib-hfi1-remove-unlikely-from-is_err-condition.patch
ntfs-remove-unlikely-from-is_err-conditions.patch
