From: Arnd Bergmann <arnd@arndb.de>
To: Russell King <linux@armlinux.org.uk>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>
Cc: Arnd Bergmann <arnd@arndb.de>,
Russell King <rmk+kernel@armlinux.org.uk>,
Sam Ravnborg <sam@ravnborg.org>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH] drm/armada: fix debugfs link error
Date: Fri, 28 Jun 2019 12:33:40 +0200 [thread overview]
Message-ID: <20190628103359.2516007-1-arnd@arndb.de> (raw)
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 <arnd@arndb.de>
---
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;
}
--
2.20.0
next reply other threads:[~2019-06-28 10:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 10:33 Arnd Bergmann [this message]
2019-06-28 12:48 ` [PATCH] drm/armada: fix debugfs link error Russell King - ARM Linux admin
2019-06-28 13:10 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190628103359.2516007-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=rmk+kernel@armlinux.org.uk \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox