From 83df2d4ed559442cdb5a1364c69aef3e682dceb0 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 14 Mar 2018 10:23:52 +0200 Subject: drm/omap: fix compile error when debugfs is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When compiling with CONFIG_OMAP2_DSS_DEBUGFS disabled, build fails due to: drivers/gpu/drm/omapdrm/dss/dss.c:1474:10: error: ‘dss_debug_dump_clocks’ undeclared (first use in this function); did you mean ‘dispc_dump_clocks’? dss_debug_dump_clocks, dss); ^~~~~~~~~~~~~~~~~~~~~ dispc_dump_clocks Fix this by moving the required functions outside #if defined(CONFIG_OMAP2_DSS_DEBUGFS). In the long term, we perhaps want to try to get all the debugfs support left out if debugfs is not enabled. Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/dss.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/dss.c') diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index 4a08bd1fc522..0b908e9de792 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -343,7 +343,6 @@ const char *dss_get_clk_source_name(enum dss_clk_source clk_src) return dss_generic_clk_source_names[clk_src]; } -#if defined(CONFIG_OMAP2_DSS_DEBUGFS) static void dss_dump_clocks(struct dss_device *dss, struct seq_file *s) { const char *fclk_name; @@ -363,7 +362,6 @@ static void dss_dump_clocks(struct dss_device *dss, struct seq_file *s) dss_runtime_put(dss); } -#endif static int dss_dump_regs(struct seq_file *s, void *p) { @@ -390,6 +388,18 @@ static int dss_dump_regs(struct seq_file *s, void *p) return 0; } +static int dss_debug_dump_clocks(struct seq_file *s, void *p) +{ + struct dss_device *dss = s->private; + + dss_dump_clocks(dss, s); + dispc_dump_clocks(dss->dispc, s); +#ifdef CONFIG_OMAP2_DSS_DSI + dsi_dump_clocks(s); +#endif + return 0; +} + static int dss_get_channel_index(enum omap_channel channel) { switch (channel) { @@ -889,18 +899,6 @@ struct dss_device *dss_get_device(struct device *dev) /* DEBUGFS */ #if defined(CONFIG_OMAP2_DSS_DEBUGFS) -static int dss_debug_dump_clocks(struct seq_file *s, void *p) -{ - struct dss_device *dss = s->private; - - dss_dump_clocks(dss, s); - dispc_dump_clocks(dss->dispc, s); -#ifdef CONFIG_OMAP2_DSS_DSI - dsi_dump_clocks(s); -#endif - return 0; -} - static int dss_initialize_debugfs(struct dss_device *dss) { struct dentry *dir; -- cgit v1.2.3-59-g8ed1b