Commit 2d7852c3 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regmap-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull regmap updates from Mark Brown:
 "A very quiet release for regmap:

   - Allow a custom _update_bits() operation for devices with no bus.

   - Fix an issue with creation of the debugfs directory when attaching
     a device to an existing no device regmap.

   - A trivial formatting fix"

[ The custom _update_bits comit came in earlier through the networking
  tree that had merged it for its own needs ]

* tag 'regmap-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: debugfs: Fix indentation
  regmap: Call regmap_debugfs_exit() prior to _init()
parents c01d85c2 b56a7cbf
......@@ -598,7 +598,7 @@ void regmap_debugfs_init(struct regmap *map)
map->debugfs_name = kasprintf(GFP_KERNEL, "dummy%d",
dummy_index);
if (!map->debugfs_name)
return;
return;
name = map->debugfs_name;
dummy_index++;
}
......
......@@ -647,6 +647,7 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,
if (ret)
return ret;
regmap_debugfs_exit(map);
regmap_debugfs_init(map);
/* Add a devres resource for dev_get_regmap() */
......
Markdown is supported
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