OMAP3: allow to disable UART4

[pandora-kernel.git] / arch / arm / mach-omap2 / pm-debug.c

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 4411163..dcb5330 100644 (file)
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -60,6 +60,7 @@ static const char pwrdm_state_names[][PWRDM_MAX_PWRSTS] = {
        "ON"
 };
 
+#ifdef CONFIG_PM_DEBUG
 void pm_dbg_update_time(struct powerdomain *pwrdm, int prev)
 {
        s64 t;
@@ -74,6 +75,7 @@ void pm_dbg_update_time(struct powerdomain *pwrdm, int prev)
 
        pwrdm->timer = t;
 }
+#endif
 
 static int clkdm_dbg_show_counter(struct clockdomain *clkdm, void *user)
 {
@@ -124,6 +126,7 @@ static int pwrdm_dbg_show_counter(struct powerdomain *pwrdm, void *user)
 
 static int pwrdm_dbg_show_timer(struct powerdomain *pwrdm, void *user)
 {
+#ifdef CONFIG_PM_DEBUG
        struct seq_file *s = (struct seq_file *)user;
        int i;
 
@@ -142,6 +145,7 @@ static int pwrdm_dbg_show_timer(struct powerdomain *pwrdm, void *user)
                        pwrdm->state_timer[i]);
 
        seq_printf(s, "\n");
+#endif
        return 0;
 }
 
@@ -205,9 +209,11 @@ DEFINE_SIMPLE_ATTRIBUTE(pwrdm_suspend_fops, pwrdm_suspend_get,
 
 static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir)
 {
+       struct dentry *d;
+
+#ifdef CONFIG_PM_DEBUG
        int i;
        s64 t;
-       struct dentry *d;
 
        t = sched_clock();
 
@@ -215,13 +221,14 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir)
                pwrdm->state_timer[i] = 0;
 
        pwrdm->timer = t;
+#endif
 
        if (strncmp(pwrdm->name, "dpll", 4) == 0)
                return 0;
 
        d = debugfs_create_dir(pwrdm->name, (struct dentry *)dir);
-
-       (void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d,
+       if (!(IS_ERR_OR_NULL(d)))
+               (void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d,
                        (void *)pwrdm, &pwrdm_suspend_fops);
 
        return 0;
@@ -264,7 +271,7 @@ static int __init pm_dbg_init(void)
                return 0;
 
        d = debugfs_create_dir("pm_debug", NULL);
-       if (IS_ERR(d))
+       if (IS_ERR_OR_NULL(d))
                return PTR_ERR(d);
 
        (void) debugfs_create_file("count", S_IRUGO,