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

Commit f509fa9b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "regmap: allow to define reg_update_bits for no bus configuration" 



This reverts commit 758c6799 which is
commit 02d6fdecb9c38de19065f6bed8d5214556fd061d upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: I4a8c202a4ad8b3640b02d417a12c4a8d2d2d62e1
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 012b5ece

drivers/base/regmap/regmap.c

+0 −1
Original line number Diff line number Diff line
@@ -813,7 +813,6 @@ struct regmap *__regmap_init(struct device *dev, 
	if (!bus) {

		map->reg_read  = config->reg_read;

		map->reg_write = config->reg_write;

		map->reg_update_bits = config->reg_update_bits;



		map->defer_caching = false;

		goto skip_format_initialization;

include/linux/regmap.h

+0 −7
Original line number Diff line number Diff line
@@ -295,11 +295,6 @@ typedef void (*regmap_unlock)(void *); 
 *		  read operation on a bus such as SPI, I2C, etc. Most of the

 *		  devices do not need this.

 * @reg_write:	  Same as above for writing.

 * @reg_update_bits: Optional callback that if filled will be used to perform

 *		     all the update_bits(rmw) operation. Should only be provided

 *		     if the function require special handling with lock and reg

 *		     handling and the operation cannot be represented as a simple

 *		     update_bits operation on a bus such as SPI, I2C, etc.

 * @fast_io:	  Register IO is fast. Use a spinlock instead of a mutex

 *	     	  to perform locking. This field is ignored if custom lock/unlock

 *	     	  functions are used (see fields lock/unlock of struct regmap_config).
@@ -376,8 +371,6 @@ struct regmap_config { 


	int (*reg_read)(void *context, unsigned int reg, unsigned int *val);

	int (*reg_write)(void *context, unsigned int reg, unsigned int val);

	int (*reg_update_bits)(void *context, unsigned int reg,

			       unsigned int mask, unsigned int val);



	bool fast_io;