Commit c252b8cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull regmap updates from Mark Brown:
 "This just contains a few small fixes, there's been no substantial
  development on regmap this release cycle"

* tag 'regmap-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: use int type to store negative error codes
  regmap: Remove superfluous check for !config in __regmap_init()
  regmap: mmio: Add missing MODULE_DESCRIPTION()
parents d5f74114 f4672dc6

drivers/base/regmap/regmap-mmio.c

+1 −0
Original line number Diff line number Diff line
@@ -609,4 +609,5 @@ void regmap_mmio_detach_clk(struct regmap *map) 
}

EXPORT_SYMBOL_GPL(regmap_mmio_detach_clk);



MODULE_DESCRIPTION("regmap MMIO Module");

MODULE_LICENSE("GPL v2");

drivers/base/regmap/regmap.c

+8 −5
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ struct regmap *__regmap_init(struct device *dev, 
		map->read_flag_mask = bus->read_flag_mask;

	}



	if (config && config->read && config->write) {

	if (config->read && config->write) {

		map->reg_read  = _regmap_bus_read;

		if (config->reg_update_bits)

			map->reg_update_bits = config->reg_update_bits;
@@ -2258,12 +2258,14 @@ EXPORT_SYMBOL_GPL(regmap_field_update_bits_base); 
 * @field: Register field to operate on

 * @bits: Bits to test

 *

 * Returns -1 if the underlying regmap_field_read() fails, 0 if at least one of the

 * tested bits is not set and 1 if all tested bits are set.

 * Returns negative errno if the underlying regmap_field_read() fails,

 * 0 if at least one of the tested bits is not set and 1 if all tested

 * bits are set.

 */

int regmap_field_test_bits(struct regmap_field *field, unsigned int bits)

{

	unsigned int val, ret;

	unsigned int val;

	int ret;



	ret = regmap_field_read(field, &val);

	if (ret)
@@ -3309,7 +3311,8 @@ EXPORT_SYMBOL_GPL(regmap_update_bits_base); 
 */

int regmap_test_bits(struct regmap *map, unsigned int reg, unsigned int bits)

{

	unsigned int val, ret;

	unsigned int val;

	int ret;



	ret = regmap_read(map, reg, &val);

	if (ret)