提交 f4d562c6 编写于 作者: M Mark Brown

regulator: Clean up debugfs error handling a bit

Use IS_ERR_OR_NULL() rather than open coding it and ignore errors from
failure to create the supply map.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 b29c7690
...@@ -2712,7 +2712,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev) ...@@ -2712,7 +2712,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
{ {
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
rdev->debugfs = debugfs_create_dir(rdev_get_name(rdev), debugfs_root); rdev->debugfs = debugfs_create_dir(rdev_get_name(rdev), debugfs_root);
if (IS_ERR(rdev->debugfs) || !rdev->debugfs) { if (IS_ERR_OR_NULL(rdev->debugfs)) {
rdev_warn(rdev, "Failed to create debugfs directory\n"); rdev_warn(rdev, "Failed to create debugfs directory\n");
rdev->debugfs = NULL; rdev->debugfs = NULL;
return; return;
...@@ -3127,14 +3127,13 @@ static int __init regulator_init(void) ...@@ -3127,14 +3127,13 @@ static int __init regulator_init(void)
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
debugfs_root = debugfs_create_dir("regulator", NULL); debugfs_root = debugfs_create_dir("regulator", NULL);
if (IS_ERR(debugfs_root) || !debugfs_root) { if (IS_ERR_OR_NULL(debugfs_root)) {
pr_warn("regulator: Failed to create debugfs directory\n"); pr_warn("regulator: Failed to create debugfs directory\n");
debugfs_root = NULL; debugfs_root = NULL;
} }
if (IS_ERR(debugfs_create_file("supply_map", 0444, debugfs_root, debugfs_create_file("supply_map", 0444, debugfs_root, NULL,
NULL, &supply_map_fops))) &supply_map_fops);
pr_warn("regulator: Failed to create supplies debugfs\n");
#endif #endif
regulator_dummy_init(); regulator_dummy_init();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册