From patchwork Fri Jun 28 10:33:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11021937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0FCBA14C0 for ; Fri, 28 Jun 2019 10:34:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F04292870B for ; Fri, 28 Jun 2019 10:34:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E210728746; Fri, 28 Jun 2019 10:34:15 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 BCEE62870B for ; Fri, 28 Jun 2019 10:34:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A5246E8CF; Fri, 28 Jun 2019 10:34:12 +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 [217.72.192.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 14E0F6E8CF for ; Fri, 28 Jun 2019 10:34:10 +0000 (UTC) Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1M4JVv-1hgX5U2JRx-000Hmo; Fri, 28 Jun 2019 12:34:01 +0200 From: Arnd Bergmann To: Russell King , David Airlie , Daniel Vetter Subject: [PATCH] drm/armada: fix debugfs link error Date: Fri, 28 Jun 2019 12:33:40 +0200 Message-Id: <20190628103359.2516007-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:yDMdCFNWi3eU4ukD4Asr7J3rQl5xwCdYhWLt3CtMOZ0hUYFIVP0 TN6nF1GWbhjRGe5AH0LiQ9iSfgDYTsV5YQjtAF49GKiyIbUdB56yLZ4vgitW4ndREs6VNRr XkiMQi+73hO8i64aUnRo/CspzmUQgF20+bQmrefYvEus5jIt2eFZjWVmUDp6cEgTjB1F9zd +4QDLSFXVhUEWpYEMDfrA== X-UI-Out-Filterresults: notjunk:1;V03:K0:WII6mkT31vU=:BJ3SdIyV3vMTpydYamkxj3 DQJ7SUbnIXLT8VuLoKVLblLnbDI/iGV1QFIjaBputIyypzuRsuVz9SoAlCRLZ0/V/49TaYKc8 g9mMlRbYjtcoiraCXQawDU1tgPJdFXcJacv4m/RjC4LLVYx7SlSid2m2isZdt6n+L73VZGUfu 8ioGU3ZxwLRLzKHaXWU6tdGGoopQJNsjIcQ9hw99N05MOXgYYwoWRkn7LUCNC7c9MZgh18DJ4 mKQR1DRFJvFfDvhkD4LpmqUasp17SZTasN1iJ6FuR5L2VxnhDjWuw3/vnKjf4Ug8vlCsHtiDy OjPFGIzKi5jJlrsy3DctMBgmhARIee2QXsmXgfuILwzFDiHE2A5WpKV7VIYjik8xTRCwvsBiP fz1+vTdI6Xyd5IpWY+DC9y1xzqjE0SPPruvX5zexTObFOr+88SMPl1qA64vPZf16/vlRglbsR sXYGwz4ZmOybPKI8ZdQAsjFamsQVgpOTmmk0bq+c0VyvfmK7LrkRqhQ8oNSLsIlUC3JozMH0x igINaxkEZXuOUsTL2GRbwDlF96yGL4yW/tqSjTb5GXP8aqdcdi4VCPd+Bg5l6iHhLEKMnp5Fp NMBPKaRjnrpayLeo+YSvO6KE0WEtDA14YWtMZoHKKyA6MIwbrcTYg4RSSMpJ0R9JBNBG/nV+R aVS21HUCWOrZEQzN53AdaIAUS+44q1TKitFQCJj9sdyIsRoaXJZKwdSGJtGiP+V5C1WahM5N1 TFkifZmoEny1NieOKP1F0CNeCChPt83nYiyOkg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , Sam Ravnborg , dri-devel@lists.freedesktop.org, Arnd Bergmann , linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Debugfs can be disabled at compile time, causing a link error with the newly restructured code: drivers/gpu/drm/armada/armada_crtc.o: In function `armada_drm_crtc_late_register': armada_crtc.c:(.text+0x974): undefined reference to `armada_drm_crtc_debugfs_init' Make the code into the debugfs init function conditional. Fixes: 05ec8bd524ba ("drm/armada: redo CRTC debugfs files") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/armada/armada_crtc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index e3a5964d8a65..03d3fd00fe00 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -773,7 +773,9 @@ static void armada_drm_crtc_destroy(struct drm_crtc *crtc) static int armada_drm_crtc_late_register(struct drm_crtc *crtc) { - armada_drm_crtc_debugfs_init(drm_to_armada_crtc(crtc)); + if (IS_ENABLED(CONFIG_DEBUG_FS)) + armada_drm_crtc_debugfs_init(drm_to_armada_crtc(crtc)); + return 0; }