diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-22 11:50:52 +0200 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-10-17 08:21:53 +0200 |
| commit | 3e3affe549ebd228501d160886c1b3999d99e0c6 (patch) | |
| tree | 392966c67128ccb80542774f17eca96f87e4cbe1 /drivers | |
| parent | 1001354ca34179f3db924eb66672442a173147dc (diff) | |
| download | linux-3e3affe549ebd228501d160886c1b3999d99e0c6.tar.gz linux-3e3affe549ebd228501d160886c1b3999d99e0c6.tar.bz2 linux-3e3affe549ebd228501d160886c1b3999d99e0c6.zip | |
drm/imx: hide an unused label
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: c1ff5a7aa3c3 ("drm/imx: Remove local fbdev emulation Kconfig option")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/imx/imx-drm-core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index 98df09c2b388..b084c571b23f 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -436,9 +436,11 @@ static int imx_drm_bind(struct device *dev) err_fbhelper: drm_kms_helper_poll_fini(drm); +#if IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) if (imxdrm->fbhelper) drm_fbdev_cma_fini(imxdrm->fbhelper); err_unbind: +#endif component_unbind_all(drm->dev, drm); err_vblank: drm_vblank_cleanup(drm); |