Skip to content

Commit

Permalink
drm/omap: fix compile error when debugfs is disabled
Browse files Browse the repository at this point in the history
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 <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed Mar 14, 2018
1 parent c39bbb9 commit 83df2d4
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions drivers/gpu/drm/omapdrm/dss/dss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
{
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 83df2d4

Please sign in to comment.