From patchwork Thu Sep 22 09:50:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101756 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2501508qgf; Thu, 22 Sep 2016 02:51:38 -0700 (PDT) X-Received: by 10.98.133.202 with SMTP id m71mr1767565pfk.155.1474537898677; Thu, 22 Sep 2016 02:51:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h22si1414579pfa.22.2016.09.22.02.51.38; Thu, 22 Sep 2016 02:51:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756154AbcIVJvg (ORCPT + 27 others); Thu, 22 Sep 2016 05:51:36 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:63235 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753455AbcIVJvd (ORCPT ); Thu, 22 Sep 2016 05:51:33 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0Mboqj-1bWJ9e0mhR-00J1fx; Thu, 22 Sep 2016 11:51:19 +0200 From: Arnd Bergmann To: Philipp Zabel , David Airlie Cc: Arnd Bergmann , Daniel Vetter , Liu Ying , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Lucas Stach , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/imx: hide an unused label Date: Thu, 22 Sep 2016 11:50:52 +0200 Message-Id: <20160922095115.2385872-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:kJR1o0YwaavQyNsrshRxRU5E08lHyCmlnXQkVkwhKL21Xg1wO0w GyLDq0s3RU7xkPkQNIj2ygOOorkMsp6I/xBJE+LRte4nILK3XczGzWOF+VH10GseIUnTPae 6y9svgyegay/BPuvKyuGsZWX6+x3PAJU3KM/5hNlNvaZF1dCMBEdUSE1yEC58sjUT8yEMGQ emYh/rTL7hUAHjuMYmftQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:8G8924yDTHA=:JG41HMOlo8oyB7d5oQhzG6 8qIrLbOVxEHi76/W0QFYWfYfv3HJI4zmH0hppi4ZknRKnK/qfiXaW2iA9i0LcDDWWLbciYWkh PfsESNcfAFyZKnnJuaqz7peDG0rKRC36ZqfwtsqXPaTWrU7TE3cNmAKrj1jCCtt9Cgm8sjABa C0QaStV+puu8xNb9xwoOdrsDLH2I4sTwj9JBVOaSECkFd1IxjGAEj6FDn86f04ajRE6CeVC5W onJnDlX6p1k/qqHAu915KqnwE2UfDSk/EFkggajbl/co/LJyAOpPA4u8Jjo9rR2xP51I9O2u6 qsNfH/8r/QFecDqWXYHwDLGbo6TFB5LvjBSmUvC6mURGDwJ8FfLabiojiRpvSZNzZ1BCBuRCH bPCLIv82sux3Jterm5yEtPNSfbsPIkZeNaxs62A+5BPRy2Isk5Fj2mHNvYrueJ2DKgScCtQXD dn5WRBoB4hPfiVhLgZTmtY3+dEA6B0OGZq0pg7xreFLUeU+thVZlXfBs940dxc/Phs1X45SIx u1AUDKco7s9ilWYrK9FvdOY73bVhfSFQ3V+lTqqFAbAWOLfJJ9U0YsJPXCpJRDc7TilS2H9IE jrtr05ikMXpyYSSLMAL5QJTmxCrmXSUTxPWMPjgTOlYLEj4KmHKnh7zlioJT7hcPrBd74Mi6d tNnMoA+D5EL3owtuM4PO0NGnu6E/yu2dw20N7RJYHVMvmbVmFQg6Pn29A+PDwH5Ykcrw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Fixes: c1ff5a7aa3c3 ("drm/imx: Remove local fbdev emulation Kconfig option") --- drivers/gpu/drm/imx/imx-drm-core.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0 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);