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: 9345395 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 568D1607D0 for ; Thu, 22 Sep 2016 14:06:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48CEF2AAE4 for ; Thu, 22 Sep 2016 14:06:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D4B62AAF1; Thu, 22 Sep 2016 14:06:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C7FB02AAE4 for ; Thu, 22 Sep 2016 14:05:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 124B86E8D0; Thu, 22 Sep 2016 14:05:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7BDE16E8D0 for ; Thu, 22 Sep 2016 14:05:56 +0000 (UTC) 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 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:1cPGgMe/puQ=:N06ky6uUVFP/H35j8XutH8 pC3YTOOlssxignWUfQ5yqL7uMJ9SMgEIJ+JG2RWdHFK8VGhQl+V53O6X4w4R4xu/0NfNCjY9N fkj6CeNT/f4rfrganXaOgELZBTKfLhMcGt0GJ+v3cEQjlrnrc3mowcn+JaTvtpUUUFf5ZSSIu RI1DUWmWUdvN5awYXnYPK3offPjZUtsU3x9tGS39KMyYI4YVRZwDy7939KUyJGrvNfFcXBkvY ubZgnEMzFDKgGdM2LaBUCA48xXN9Qd9eBqFWaF9HYrleSs5YOQdvv/pK0DlYA/PuLMyfm5OBV /RyRwdAxLdoYfFv13lET9ImLsFUb5l891ncma2GGDjPr7sxurMjg9NlOsb7NCXxzqr+mie3il 9DG56nEiMguDU6pS9hOBYtLVzHU9ucXnbtYuUFfBQ2lAea4i4P2enimugCcoL129PKdL2ggrX K4XqedeHpdNBnXXpQOCS1JAQ8oyBSWojD3d4sGCsM2vtpHByQK8FqtHhUORfsK+v+fut0jvox m1Lpz7AEogL1R6f1BagkgDc+/ORYXAi6OPuvfLcJloOPTXfI15iZPivHVHiPvwVrJK3O73i5S LAsSwqjR6tYVZeRwBsoqL4R8LO8sYxDXTMqYFyErYXRajRomelmnseA5+XgEVarSOLpqymp3+ g/dm9Nuwb8gTCzT5oXchooTCkVC2Y6UVvpT+gth5sjDvaGvOKFGGuvHv9IIagOuXgcpg= Cc: Arnd Bergmann , Daniel Vetter , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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(+) 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);