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: 168056 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3515640ilk; Fri, 28 Jun 2019 03:34:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqyGmIFN47bXbkWynbfb6f6SHA5rl/WL/oc0HBZlfdjAp50ww/kHJ2LPeJcXZpOOJEus4W5E X-Received: by 2002:a17:902:2bcb:: with SMTP id l69mr10757159plb.155.1561718054732; Fri, 28 Jun 2019 03:34:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561718054; cv=none; d=google.com; s=arc-20160816; b=BV5q61Sn72hgMi5UlEy37xKKdo+j/Z2wQwIRhjVciuj3TcxuWuFuHe+cvjYhB8P7Ab lBNLaWYBWbWI6WuDXVgKVwD4wZ+9OW6Khbv4HD1uGO0o4PRDYMN8rbdS876FogzdzqHZ 7T1/wEipP390mkvTHVCNFMe4J8CsyHaiJuxxGS1VId6A7TmpDtJF5cmcfPtpNxZxMdz1 +6Ra7f/AXG+39AnCPvGo39jvrW8ZS13LJBUDt3T1IpTtPHRBMrQy/FD0TOXz43WEwARD dCM6ZQi9PLuppiFDGC8Gza1te4aWVf9DhOzELrMuCoqZv7cWz6Kvzs/YYHDIp2EUGeyj 5D9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:message-id:date:subject:to:from :delivered-to; bh=3ii3rjsLQtOvqOROGA0g3CmNE10MJx18FDf8JOa4VcY=; b=oudZ/eiBQ2dnNv29TsOkcMnWyF+cYnNJuCV1dqMwOpVKNRNjfjXbKNPESbPlImi9W9 lF8l1BoUWzZlIiOtCBfx5x8+hFlJ7sqOKpawJtpzVADI6aaKaOdk1iwZ+2a21uIfA+VL 92KFItywV9RM35SRHRpTReibBzQPvxv1bhWLsuH0pDerTl9RW4OO+z8FXFN2QFhI72bz MVwDlXT2pIa2jOXi1/L/YviepYNodOsZoiz/ocpjwgcM6qjt9DEAZ3n7dZKb6MymCoir U2u4/4ZhSOWaLGpQIKJ4zRIH/8DtFKdBhdUKFkF2E/Ye/+6b6iIgtAdxHh/Ja9VBHvUt aGww== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id f20si2049759pfn.166.2019.06.28.03.34.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Jun 2019 03:34:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org 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-Spam-Flag: NO 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" 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; }