Unverified Commit 419386b6 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mark Brown
Browse files

regmap: Wire up regmap_config provided bulk write in missed functions 



There are some functions that were missed by commit d77e7456 ("regmap:
Add bulk read/write callbacks into regmap_config") when support to define
bulk read/write callbacks in regmap_config was introduced.

The regmap_bulk_write() and regmap_noinc_write() functions weren't changed
to use the added map->write instead of the map->bus->write handler.

Also, the regmap_can_raw_write() was not modified to take map->write into
account. So will only return true if a bus with a .write callback is set.

Fixes: d77e7456 ("regmap: Add bulk read/write callbacks into regmap_config")
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20220616073435.1988219-4-javierm@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 147b5fff

drivers/base/regmap/regmap.c

+4 −6
Original line number Diff line number Diff line
@@ -1880,8 +1880,7 @@ static int _regmap_raw_write_impl(struct regmap *map, unsigned int reg, 
 */

bool regmap_can_raw_write(struct regmap *map)

{

	return map->bus && map->bus->write && map->format.format_val &&

		map->format.format_reg;

	return map->write && map->format.format_val && map->format.format_reg;

}

EXPORT_SYMBOL_GPL(regmap_can_raw_write);
@@ -2155,10 +2154,9 @@ int regmap_noinc_write(struct regmap *map, unsigned int reg, 
	size_t write_len;

	int ret;



	if (!map->bus)

		return -EINVAL;

	if (!map->bus->write)

	if (!map->write)

		return -ENOTSUPP;



	if (val_len % map->format.val_bytes)

		return -EINVAL;

	if (!IS_ALIGNED(reg, map->reg_stride))
@@ -2278,7 +2276,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
	 * Some devices don't support bulk write, for them we have a series of

	 * single write operations.

	 */

	if (!map->bus || !map->format.parse_inplace) {

	if (!map->write || !map->format.parse_inplace) {

		map->lock(map->lock_arg);

		for (i = 0; i < val_count; i++) {

			unsigned int ival;