korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-20 02:34:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

drm/imx: hide an unused label

Browse Source 
The imx_drm_bind function causes a warning in linux-next when
CONFIG_DRM_FBDEV_EMULATION is not set:

drivers/gpu/drm/imx/imx-drm-core.c: In function 'imx_drm_bind':
drivers/gpu/drm/imx/imx-drm-core.c:441:1: error: label 'err_unbind' defined but not used [-Werror=unused-label]

I don't understand why the warning only showed up now, as the
code has not been modified recently, but there is an obvious
fix in adding another #if for the symbol.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: c1ff5a7aa3 ("drm/imx: Remove local fbdev emulation Kconfig option")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Arnd Bergmann 2016-09-22 11:50:52 +02:00 committed by Philipp Zabel
parent 1001354ca3
commit 3e3affe549
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/imx/imx-drm-core.c
View File

@ -436,9 +436,11 @@ static int imx_drm_bind(struct device *dev)
err_fbhelper: err_fbhelper:
drm_kms_helper_poll_fini(drm); drm_kms_helper_poll_fini(drm);
#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION)
if (imxdrm->fbhelper) if (imxdrm->fbhelper)
drm_fbdev_cma_fini(imxdrm->fbhelper); drm_fbdev_cma_fini(imxdrm->fbhelper);
err_unbind: err_unbind:
#endif
component_unbind_all(drm->dev, drm); component_unbind_all(drm->dev, drm);
err_vblank: err_vblank:
drm_vblank_cleanup(drm); drm_vblank_cleanup(drm);