aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2012-06-18 19:31:23 -0400
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-06-27 07:22:15 -0400
commit903e0e4ef9120c3d7693599acb95e76e8263fb35 (patch)
tree8814f97bbbcfd2a0cd221cac2ed5a3b08cd21fd5 /drivers/mtd
parent2d4cf5ae123e4a7bd26a88e600581aa809bcad7f (diff)
UBI: correct usage of IS_ENABLED()
Commit "e9b4cf2 UBI: fix debugfs-less systems support" fixed one regression but introduced a different regression - the debugfs is now always compiled out. Root cause: IS_ENABLED() arguments should be used with the CONFIG_* prefix. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/ubi/debug.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 09d4f8d9d59..7c138030521 100644
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -264,7 +264,7 @@ static struct dentry *dfs_rootdir;
264 */ 264 */
265int ubi_debugfs_init(void) 265int ubi_debugfs_init(void)
266{ 266{
267 if (!IS_ENABLED(DEBUG_FS)) 267 if (!IS_ENABLED(CONFIG_DEBUG_FS))
268 return 0; 268 return 0;
269 269
270 dfs_rootdir = debugfs_create_dir("ubi", NULL); 270 dfs_rootdir = debugfs_create_dir("ubi", NULL);
@@ -284,7 +284,7 @@ int ubi_debugfs_init(void)
284 */ 284 */
285void ubi_debugfs_exit(void) 285void ubi_debugfs_exit(void)
286{ 286{
287 if (IS_ENABLED(DEBUG_FS)) 287 if (IS_ENABLED(CONFIG_DEBUG_FS))
288 debugfs_remove(dfs_rootdir); 288 debugfs_remove(dfs_rootdir);
289} 289}
290 290
@@ -407,7 +407,7 @@ int ubi_debugfs_init_dev(struct ubi_device *ubi)
407 struct dentry *dent; 407 struct dentry *dent;
408 struct ubi_debug_info *d = ubi->dbg; 408 struct ubi_debug_info *d = ubi->dbg;
409 409
410 if (!IS_ENABLED(DEBUG_FS)) 410 if (!IS_ENABLED(CONFIG_DEBUG_FS))
411 return 0; 411 return 0;
412 412
413 n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME, 413 n = snprintf(d->dfs_dir_name, UBI_DFS_DIR_LEN + 1, UBI_DFS_DIR_NAME,
@@ -477,6 +477,6 @@ out:
477 */ 477 */
478void ubi_debugfs_exit_dev(struct ubi_device *ubi) 478void ubi_debugfs_exit_dev(struct ubi_device *ubi)
479{ 479{
480 if (IS_ENABLED(DEBUG_FS)) 480 if (IS_ENABLED(CONFIG_DEBUG_FS))
481 debugfs_remove_recursive(ubi->dbg->dfs_dir); 481 debugfs_remove_recursive(ubi->dbg->dfs_dir);
482} 482}