Verified Commit 1bd45846 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regmap-5.4' into regmap-next

parents 0161b871 9d52a35e
...@@ -588,14 +588,6 @@ void regmap_debugfs_init(struct regmap *map, const char *name) ...@@ -588,14 +588,6 @@ void regmap_debugfs_init(struct regmap *map, const char *name)
} }
map->debugfs = debugfs_create_dir(name, regmap_debugfs_root); map->debugfs = debugfs_create_dir(name, regmap_debugfs_root);
if (!map->debugfs) {
dev_warn(map->dev,
"Failed to create %s debugfs directory\n", name);
kfree(map->debugfs_name);
map->debugfs_name = NULL;
return;
}
debugfs_create_file("name", 0400, map->debugfs, debugfs_create_file("name", 0400, map->debugfs,
map, &regmap_name_fops); map, &regmap_name_fops);
...@@ -672,10 +664,6 @@ void regmap_debugfs_initcall(void) ...@@ -672,10 +664,6 @@ void regmap_debugfs_initcall(void)
struct regmap_debugfs_node *node, *tmp; struct regmap_debugfs_node *node, *tmp;
regmap_debugfs_root = debugfs_create_dir("regmap", NULL); regmap_debugfs_root = debugfs_create_dir("regmap", NULL);
if (!regmap_debugfs_root) {
pr_warn("regmap: Failed to create debugfs root\n");
return;
}
mutex_lock(&regmap_debugfs_early_lock); mutex_lock(&regmap_debugfs_early_lock);
list_for_each_entry_safe(node, tmp, &regmap_debugfs_early_list, link) { list_for_each_entry_safe(node, tmp, &regmap_debugfs_early_list, link) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment