Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm: remove unlikely() from WARN_ON() conditions

"unlikely(WARN_ON(x))" is excessive. WARN_ON() already uses unlikely()
internally.

Signed-off-by: Denis Efremov <efremov@linux.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: Joe Perches <joe@perches.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

authored by

Denis Efremov and committed by
Rob Clark
c044e86f 5fb9b797

+3 -3
+2 -2
drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c
··· 253 253 u32 blend_cfg; 254 254 struct mdp5_hw_mixer *mixer = pipeline->mixer; 255 255 256 - if (unlikely(WARN_ON(!mixer))) { 256 + if (WARN_ON(!mixer)) { 257 257 DRM_DEV_ERROR(ctl_mgr->dev->dev, "CTL %d cannot find LM", 258 258 ctl->id); 259 259 return -EINVAL; ··· 695 695 goto fail; 696 696 } 697 697 698 - if (unlikely(WARN_ON(ctl_cfg->count > MAX_CTL))) { 698 + if (WARN_ON(ctl_cfg->count > MAX_CTL)) { 699 699 DRM_DEV_ERROR(dev->dev, "Increase static pool size to at least %d\n", 700 700 ctl_cfg->count); 701 701 ret = -ENOSPC;
+1 -1
drivers/gpu/drm/msm/disp/mdp_format.c
··· 174 174 175 175 struct csc_cfg *mdp_get_default_csc_cfg(enum csc_type type) 176 176 { 177 - if (unlikely(WARN_ON(type >= CSC_MAX))) 177 + if (WARN_ON(type >= CSC_MAX)) 178 178 return NULL; 179 179 180 180 return &csc_convert[type];