diff options
author | Chandrabhanu Mahapatra <cmahapatra@ti.com> | 2012-09-29 04:27:31 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-12 07:15:31 -0400 |
commit | 28bcd199cc4465733c1ac0c70135a385fff97c71 (patch) | |
tree | 49302fd87448cee78feaf1af4dda01493d9b6183 | |
parent | f30be7d326671ec5691f83b6d473550ac002e008 (diff) |
OMAPDSS: Remove dss_debug variable
All the debug prints have been replaced with pr_debug(). Thus, the dependency on
dss_debug variable is replaced with dyndbg in dynamic debugging mode and DEBUG
flag otherwise. So, the dss_debug variable is removed along with checks for
DEBUG flag.
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>
-rw-r--r-- | drivers/video/omap2/dss/core.c | 5 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 8 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dsi.c | 7 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dss.h | 4 |
4 files changed, 2 insertions, 22 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 826d64faeaa7..3794147b6eb0 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c | |||
@@ -53,11 +53,6 @@ static char *def_disp_name; | |||
53 | module_param_named(def_disp, def_disp_name, charp, 0); | 53 | module_param_named(def_disp, def_disp_name, charp, 0); |
54 | MODULE_PARM_DESC(def_disp, "default display name"); | 54 | MODULE_PARM_DESC(def_disp, "default display name"); |
55 | 55 | ||
56 | #ifdef DEBUG | ||
57 | bool dss_debug; | ||
58 | module_param_named(debug, dss_debug, bool, 0644); | ||
59 | #endif | ||
60 | |||
61 | const char *dss_get_default_display_name(void) | 56 | const char *dss_get_default_display_name(void) |
62 | { | 57 | { |
63 | return core.default_display_name; | 58 | return core.default_display_name; |
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 67d9f3bdea39..b5204b490ceb 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -3669,7 +3669,6 @@ int omap_dispc_unregister_isr(omap_dispc_isr_t isr, void *arg, u32 mask) | |||
3669 | } | 3669 | } |
3670 | EXPORT_SYMBOL(omap_dispc_unregister_isr); | 3670 | EXPORT_SYMBOL(omap_dispc_unregister_isr); |
3671 | 3671 | ||
3672 | #ifdef DEBUG | ||
3673 | static void print_irq_status(u32 status) | 3672 | static void print_irq_status(u32 status) |
3674 | { | 3673 | { |
3675 | if ((status & dispc.irq_error_mask) == 0) | 3674 | if ((status & dispc.irq_error_mask) == 0) |
@@ -3690,7 +3689,6 @@ static void print_irq_status(u32 status) | |||
3690 | dss_has_feature(FEAT_MGR_LCD3) ? PIS(SYNC_LOST3) : ""); | 3689 | dss_has_feature(FEAT_MGR_LCD3) ? PIS(SYNC_LOST3) : ""); |
3691 | #undef PIS | 3690 | #undef PIS |
3692 | } | 3691 | } |
3693 | #endif | ||
3694 | 3692 | ||
3695 | /* Called from dss.c. Note that we don't touch clocks here, | 3693 | /* Called from dss.c. Note that we don't touch clocks here, |
3696 | * but we presume they are on because we got an IRQ. However, | 3694 | * but we presume they are on because we got an IRQ. However, |
@@ -3723,10 +3721,8 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *arg) | |||
3723 | spin_unlock(&dispc.irq_stats_lock); | 3721 | spin_unlock(&dispc.irq_stats_lock); |
3724 | #endif | 3722 | #endif |
3725 | 3723 | ||
3726 | #ifdef DEBUG | 3724 | print_irq_status(irqstatus); |
3727 | if (dss_debug) | 3725 | |
3728 | print_irq_status(irqstatus); | ||
3729 | #endif | ||
3730 | /* Ack the interrupt. Do it here before clocks are possibly turned | 3726 | /* Ack the interrupt. Do it here before clocks are possibly turned |
3731 | * off */ | 3727 | * off */ |
3732 | dispc_write_reg(DISPC_IRQSTATUS, irqstatus); | 3728 | dispc_write_reg(DISPC_IRQSTATUS, irqstatus); |
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 19daee9fd302..bbbafe370572 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c | |||
@@ -1095,15 +1095,11 @@ static inline void dsi_enable_pll_clock(struct platform_device *dsidev, | |||
1095 | } | 1095 | } |
1096 | } | 1096 | } |
1097 | 1097 | ||
1098 | #ifdef DEBUG | ||
1099 | static void _dsi_print_reset_status(struct platform_device *dsidev) | 1098 | static void _dsi_print_reset_status(struct platform_device *dsidev) |
1100 | { | 1099 | { |
1101 | u32 l; | 1100 | u32 l; |
1102 | int b0, b1, b2; | 1101 | int b0, b1, b2; |
1103 | 1102 | ||
1104 | if (!dss_debug) | ||
1105 | return; | ||
1106 | |||
1107 | /* A dummy read using the SCP interface to any DSIPHY register is | 1103 | /* A dummy read using the SCP interface to any DSIPHY register is |
1108 | * required after DSIPHY reset to complete the reset of the DSI complex | 1104 | * required after DSIPHY reset to complete the reset of the DSI complex |
1109 | * I/O. */ | 1105 | * I/O. */ |
@@ -1134,9 +1130,6 @@ static void _dsi_print_reset_status(struct platform_device *dsidev) | |||
1134 | 1130 | ||
1135 | #undef DSI_FLD_GET | 1131 | #undef DSI_FLD_GET |
1136 | } | 1132 | } |
1137 | #else | ||
1138 | #define _dsi_print_reset_status(x) | ||
1139 | #endif | ||
1140 | 1133 | ||
1141 | static inline int dsi_if_enable(struct platform_device *dsidev, bool enable) | 1134 | static inline int dsi_if_enable(struct platform_device *dsidev, bool enable) |
1142 | { | 1135 | { |
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index d8aeee49825b..75f841a4a1e1 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h | |||
@@ -23,10 +23,6 @@ | |||
23 | #ifndef __OMAP2_DSS_H | 23 | #ifndef __OMAP2_DSS_H |
24 | #define __OMAP2_DSS_H | 24 | #define __OMAP2_DSS_H |
25 | 25 | ||
26 | #ifdef DEBUG | ||
27 | extern bool dss_debug; | ||
28 | #endif | ||
29 | |||
30 | #ifdef pr_fmt | 26 | #ifdef pr_fmt |
31 | #undef pr_fmt | 27 | #undef pr_fmt |
32 | #endif | 28 | #endif |