aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pm-debug.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 21:31:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 21:31:29 +0100
commit33b9f582c5c1db515412cc7efff28f7d1779321f (patch)
tree60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-omap2/pm-debug.c
parent946342d03ec4e8367bba7bb99e7155e97f69058a (diff)
parent008ca431822f39a023322b3598d8366faf46cfc1 (diff)
downloadlinux-linaro-stable-33b9f582c5c1db515412cc7efff28f7d1779321f.tar.gz
Merge branch 'cleanup' into for-linus
Conflicts: arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-omap2/pm-debug.c')
-rw-r--r--arch/arm/mach-omap2/pm-debug.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 1edd000a8143..0b339861d751 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -217,7 +217,7 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *dir)
return 0;
d = debugfs_create_dir(pwrdm->name, (struct dentry *)dir);
- if (!(IS_ERR_OR_NULL(d)))
+ if (d)
(void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d,
(void *)pwrdm, &pwrdm_suspend_fops);
@@ -261,8 +261,8 @@ static int __init pm_dbg_init(void)
return 0;
d = debugfs_create_dir("pm_debug", NULL);
- if (IS_ERR_OR_NULL(d))
- return PTR_ERR(d);
+ if (!d)
+ return -EINVAL;
(void) debugfs_create_file("count", S_IRUGO,
d, (void *)DEBUG_FILE_COUNTERS, &debug_fops);