diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 16:31:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-05-02 16:31:29 -0400 |
| commit | 33b9f582c5c1db515412cc7efff28f7d1779321f (patch) | |
| tree | 60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-omap2/pm-debug.c | |
| parent | 946342d03ec4e8367bba7bb99e7155e97f69058a (diff) | |
| parent | 008ca431822f39a023322b3598d8366faf46cfc1 (diff) | |
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.c | 6 |
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) | |||
| 217 | return 0; | 217 | return 0; |
| 218 | 218 | ||
| 219 | d = debugfs_create_dir(pwrdm->name, (struct dentry *)dir); | 219 | d = debugfs_create_dir(pwrdm->name, (struct dentry *)dir); |
| 220 | if (!(IS_ERR_OR_NULL(d))) | 220 | if (d) |
| 221 | (void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d, | 221 | (void) debugfs_create_file("suspend", S_IRUGO|S_IWUSR, d, |
| 222 | (void *)pwrdm, &pwrdm_suspend_fops); | 222 | (void *)pwrdm, &pwrdm_suspend_fops); |
| 223 | 223 | ||
| @@ -261,8 +261,8 @@ static int __init pm_dbg_init(void) | |||
| 261 | return 0; | 261 | return 0; |
| 262 | 262 | ||
| 263 | d = debugfs_create_dir("pm_debug", NULL); | 263 | d = debugfs_create_dir("pm_debug", NULL); |
| 264 | if (IS_ERR_OR_NULL(d)) | 264 | if (!d) |
| 265 | return PTR_ERR(d); | 265 | return -EINVAL; |
| 266 | 266 | ||
| 267 | (void) debugfs_create_file("count", S_IRUGO, | 267 | (void) debugfs_create_file("count", S_IRUGO, |
| 268 | d, (void *)DEBUG_FILE_COUNTERS, &debug_fops); | 268 | d, (void *)DEBUG_FILE_COUNTERS, &debug_fops); |