diff options
| author | Mark Brown <broonie@kernel.org> | 2018-12-19 18:38:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-19 18:38:31 +0000 |
| commit | 9b268ebe25cd649c8760c19dc8b7bda606bfba22 (patch) | |
| tree | 3b3237ce920ea4c81ad119900f629597ef273d35 /drivers/base | |
| parent | 7566ec393f4161572ba6f11ad5171fd5d59b0fbd (diff) | |
| parent | 580d48573c43211fe51f411d484dbb693cc93f7c (diff) | |
Merge branch 'regmap-4.21' into regmap-next
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regcache-rbtree.c | 12 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c index b1e9aae9a5d0..2e8f0144f9ab 100644 --- a/drivers/base/regmap/regcache-rbtree.c +++ b/drivers/base/regmap/regcache-rbtree.c @@ -177,17 +177,7 @@ static int rbtree_show(struct seq_file *s, void *ignored) return 0; } -static int rbtree_open(struct inode *inode, struct file *file) -{ - return single_open(file, rbtree_show, inode->i_private); -} - -static const struct file_operations rbtree_fops = { - .open = rbtree_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(rbtree); static void rbtree_debugfs_init(struct regmap *map) { diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 87b562e49a43..19eb454f26c3 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -435,17 +435,7 @@ static int regmap_access_show(struct seq_file *s, void *ignored) return 0; } -static int access_open(struct inode *inode, struct file *file) -{ - return single_open(file, regmap_access_show, inode->i_private); -} - -static const struct file_operations regmap_access_fops = { - .open = access_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, -}; +DEFINE_SHOW_ATTRIBUTE(regmap_access); static ssize_t regmap_cache_only_write_file(struct file *file, const char __user *user_buf, |