Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 9b268ebe authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regmap-4.21' into regmap-next

parents 7566ec39 580d4857

drivers/base/regmap/regcache-rbtree.c

+1 −11
Original line number Diff line number Diff line
@@ -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)

{

drivers/base/regmap/regmap-debugfs.c

+1 −11
Original line number Diff line number Diff line
@@ -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,