From patchwork Fri Jun 21 22:38:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2764771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0727BC0AB1 for ; Fri, 21 Jun 2013 22:39:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE09C201B6 for ; Fri, 21 Jun 2013 22:39:03 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E627B201B4 for ; Fri, 21 Jun 2013 22:39:02 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq9yr-00043F-Qi; Fri, 21 Jun 2013 22:38:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq9yp-0007DB-80; Fri, 21 Jun 2013 22:38:55 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uq9yi-0007Bw-E0 for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2013 22:38:52 +0000 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0LyS7K-1UBovO0lgE-015HKy; Sat, 22 Jun 2013 00:38:24 +0200 From: Arnd Bergmann To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm: always provide debugfs function prototypes Date: Sat, 22 Jun 2013 00:38:16 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-22-generic; KDE/4.3.2; x86_64; ; ) MIME-Version: 1.0 Message-Id: <201306220038.17115.arnd@arndb.de> X-Provags-ID: V02:K0:XOC8x7fUtgRU7S4wsEJRKcKIT3ewDBaWdVGaIX1BXAg RIqJmZ/eBE84DsAdiLFjH+H7xgRvXn7Kbb+7+ppwQt25VRQeUl AvNgiXaNYLgaMnlEi8DUVyHWzf2vnV5yrDJJMZMfAuYZZfnfUp MRQ0zeQ822Bj0W86o/O5sWjtpl3m1C4auQnr6ZlxHgkU3eBn3l FD6Wt9ZIvOLzoMCkY2ro6eXtU7lUWRofkqaI5EFqfjpYbfKaZ6 pTE3SZJl7FD23h7UYhtnuMF7h9uB/IenhA5OlaBe2TQ/prNcon iZCc6ugqoA2/PyKYvTrcw6dttxTdx6sPm+wV7+uiRokshv26+g 45hSUlh56W16sGc/IuNU= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130621_183852_125044_5E6DEEA5 X-CRM114-Status: UNSURE ( 8.78 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Dave Airlie , Linux Kernel Mailing List , Linux ARM Kernel List , Ben Gamari X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is generally considered bad style to enclose function prototypes in header files in #ifdef. This case illustrates why that is: The tegra host1x driver calls into the debugfs functions if CONFIG_DEBUG_FS is enabled, but that code is otherwise already discarded by the compiler, so leaving the prototype in place actually makes everything work. drivers/gpu/host1x/drm/dc.c: In function 'tegra_dc_debugfs_init': drivers/gpu/host1x/drm/dc.c:1004:2: error: implicit declaration of function 'drm_debugfs_create_files' [-Werror=implicit-function-declaration] drivers/gpu/host1x/drm/dc.c: In function 'tegra_dc_debugfs_exit': drivers/gpu/host1x/drm/dc.c:1026:2: error: implicit declaration of function 'drm_debugfs_remove_files' [-Werror=implicit-function-declaration] Signed-off-by: Arnd Bergmann Cc: Ben Gamari Cc: Dave Airlie Reviewed-by: Thierry Reding diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 63d17ee..8bc105e 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1551,7 +1551,7 @@ extern int drm_proc_init(struct drm_minor *minor, struct proc_dir_entry *root); extern int drm_proc_cleanup(struct drm_minor *minor, struct proc_dir_entry *root); /* Debugfs support */ -#if defined(CONFIG_DEBUG_FS) + extern int drm_debugfs_init(struct drm_minor *minor, int minor_id, struct dentry *root); extern int drm_debugfs_create_files(struct drm_info_list *files, int count, @@ -1559,7 +1559,6 @@ extern int drm_debugfs_create_files(struct drm_info_list *files, int count, extern int drm_debugfs_remove_files(struct drm_info_list *files, int count, struct drm_minor *minor); extern int drm_debugfs_cleanup(struct drm_minor *minor); -#endif /* Info file support */ extern int drm_name_info(struct seq_file *m, void *data);