Skip to content

Commit

Permalink
OMAPDSS: Cleanup DSSDBG with dynamic pr_debug function
Browse files Browse the repository at this point in the history 
The printk in DSSDBG function definition is replaced with dynamic debug enabled
pr_debug(). The use of dynamic debugging provides more flexibility as each debug
statement can be enabled or disabled dynamically on basis of source filename,
line number, module name etc., by writing to a control file in debugfs
filesystem. For better understanding please refer to
Documentation/dynamic-debug-howto.txt.

The DSSDBGF() differs from DSSDBG() by providing function name. However,
function name, line number, module name and thread ID can be printed through
dynamic debug by setting appropriate flags 'f','l','m' and 't' in the debugfs
control file. So, DSSDBGF instances are replaced with DSSDBG.

Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com>
Reviewed-by: Sumit Semwal <sumit.semwal@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Chandrabhanu Mahapatra authored and Tomi Valkeinen committed Oct 12, 2012
1 parent 1b3bcb3 commit 702d267
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 36 deletions.
8 changes: 4 additions & 4 deletions drivers/video/omap2/dss/apply.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ static void dss_ovl_write_regs(struct omap_overlay *ovl)
struct mgr_priv_data *mp;
int r;

DSSDBGF("%d", ovl->id);
DSSDBG("writing ovl %d regs", ovl->id);

if (!op->enabled || !op->info_dirty)
return;
Expand Down Expand Up @@ -608,7 +608,7 @@ static void dss_ovl_write_regs_extra(struct omap_overlay *ovl)
struct ovl_priv_data *op = get_ovl_priv(ovl);
struct mgr_priv_data *mp;

DSSDBGF("%d", ovl->id);
DSSDBG("writing ovl %d regs extra", ovl->id);

if (!op->extra_info_dirty)
return;
Expand All @@ -632,7 +632,7 @@ static void dss_mgr_write_regs(struct omap_overlay_manager *mgr)
struct mgr_priv_data *mp = get_mgr_priv(mgr);
struct omap_overlay *ovl;

DSSDBGF("%d", mgr->id);
DSSDBG("writing mgr %d regs", mgr->id);

if (!mp->enabled)
return;
Expand All @@ -658,7 +658,7 @@ static void dss_mgr_write_regs_extra(struct omap_overlay_manager *mgr)
{
struct mgr_priv_data *mp = get_mgr_priv(mgr);

DSSDBGF("%d", mgr->id);
DSSDBG("writing mgr %d regs extra", mgr->id);

if (!mp->extra_info_dirty)
return;
Expand Down
12 changes: 6 additions & 6 deletions drivers/video/omap2/dss/dsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1612,7 +1612,7 @@ int dsi_pll_set_clock_div(struct platform_device *dsidev,
u8 regn_start, regn_end, regm_start, regm_end;
u8 regm_dispc_start, regm_dispc_end, regm_dsi_start, regm_dsi_end;

DSSDBGF();
DSSDBG("DSI PLL clock config starts");

dsi->current_cinfo.clkin = cinfo->clkin;
dsi->current_cinfo.fint = cinfo->fint;
Expand Down Expand Up @@ -2431,7 +2431,7 @@ static int dsi_cio_init(struct platform_device *dsidev)
int r;
u32 l;

DSSDBGF();
DSSDBG("DSI CIO init starts");

r = dss_dsi_enable_pads(dsi->module_id, dsi_get_lane_mask(dsidev));
if (r)
Expand Down Expand Up @@ -2782,7 +2782,7 @@ static void dsi_vc_initial_config(struct platform_device *dsidev, int channel)
{
u32 r;

DSSDBGF("%d", channel);
DSSDBG("Initial config of virtual channel %d", channel);

r = dsi_read_reg(dsidev, DSI_VC_CTRL(channel));

Expand Down Expand Up @@ -2814,7 +2814,7 @@ static int dsi_vc_config_source(struct platform_device *dsidev, int channel,
if (dsi->vc[channel].source == source)
return 0;

DSSDBGF("%d", channel);
DSSDBG("Source config of virtual channel %d", channel);

dsi_sync_vc(dsidev, channel);

Expand Down Expand Up @@ -3572,7 +3572,7 @@ static int dsi_enter_ulps(struct platform_device *dsidev)
int r, i;
unsigned mask;

DSSDBGF();
DSSDBG("Entering ULPS");

WARN_ON(!dsi_bus_is_locked(dsidev));

Expand Down Expand Up @@ -4276,7 +4276,7 @@ int omapdss_dsi_set_clocks(struct omap_dss_device *dssdev,
unsigned long pck;
int r;

DSSDBGF("ddr_clk %lu, lp_clk %lu", ddr_clk, lp_clk);
DSSDBG("Setting DSI clocks: ddr_clk %lu, lp_clk %lu", ddr_clk, lp_clk);

mutex_lock(&dsi->lock);

Expand Down
34 changes: 8 additions & 26 deletions drivers/video/omap2/dss/dss.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,20 @@

#ifdef DEBUG
extern bool dss_debug;
#ifdef DSS_SUBSYS_NAME
#define DSSDBG(format, ...) \
if (dss_debug) \
printk(KERN_DEBUG "omapdss " DSS_SUBSYS_NAME ": " format, \
## __VA_ARGS__)
#else
#define DSSDBG(format, ...) \
if (dss_debug) \
printk(KERN_DEBUG "omapdss: " format, ## __VA_ARGS__)
#endif

#ifdef DSS_SUBSYS_NAME
#define DSSDBGF(format, ...) \
if (dss_debug) \
printk(KERN_DEBUG "omapdss " DSS_SUBSYS_NAME \
": %s(" format ")\n", \
__func__, \
## __VA_ARGS__)
#else
#define DSSDBGF(format, ...) \
if (dss_debug) \
printk(KERN_DEBUG "omapdss: " \
": %s(" format ")\n", \
__func__, \
## __VA_ARGS__)
#ifdef pr_fmt
#undef pr_fmt
#endif

#else /* DEBUG */
#define DSSDBG(format, ...)
#define DSSDBGF(format, ...)
#ifdef DSS_SUBSYS_NAME
#define pr_fmt(fmt) DSS_SUBSYS_NAME ": " fmt
#else
#define pr_fmt(fmt) fmt
#endif

#define DSSDBG(format, ...) \
pr_debug(format, ## __VA_ARGS__)

#ifdef DSS_SUBSYS_NAME
#define DSSERR(format, ...) \
Expand Down

0 comments on commit 702d267

Please sign in to comment.