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

Commit f4298360 authored by Stephen Boyd's avatar Stephen Boyd Committed by Mark Brown
Browse files

regmap: Allow regmap_bulk_write() to work for "no-bus" regmaps 



regmap_bulk_write() should decay to performing individual writes
if we're using a "no-bus" regmap. Unfortunately, it returns an
error because there is no map->bus pointer. Fix it.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 34f65334

drivers/base/regmap/regmap.c

+37 −25
Original line number Diff line number Diff line
@@ -1514,21 +1514,49 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
{

	int ret = 0, i;

	size_t val_bytes = map->format.val_bytes;

	void *wval;



	if (!map->bus)

		return -EINVAL;

	if (!map->format.parse_inplace)

	if (map->bus && !map->format.parse_inplace)

		return -EINVAL;

	if (reg % map->reg_stride)

		return -EINVAL;



	map->lock(map->lock_arg);

	/*

	 * Some devices don't support bulk write, for

	 * them we have a series of single write operations.

	 */

	if (!map->bus || map->use_single_rw) {

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

			unsigned int ival;



			switch (val_bytes) {

			case 1:

				ival = *(u8 *)(val + (i * val_bytes));

				break;

			case 2:

				ival = *(u16 *)(val + (i * val_bytes));

				break;

			case 4:

				ival = *(u32 *)(val + (i * val_bytes));

				break;

#ifdef CONFIG_64BIT

			case 8:

				ival = *(u64 *)(val + (i * val_bytes));

				break;

#endif

			default:

				ret = -EINVAL;

				goto out;

			}



	/* No formatting is require if val_byte is 1 */

	if (val_bytes == 1) {

		wval = (void *)val;

			ret = _regmap_write(map, reg + (i * map->reg_stride),

					ival);

			if (ret != 0)

				goto out;

		}

	} else {

		void *wval;



		wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL);

		if (!wval) {

			ret = -ENOMEM;
@@ -1537,27 +1565,11 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val, 
		}

		for (i = 0; i < val_count * val_bytes; i += val_bytes)

			map->format.parse_inplace(wval + i);

	}

	/*

	 * Some devices does not support bulk write, for

	 * them we have a series of single write operations.

	 */

	if (map->use_single_rw) {

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

			ret = _regmap_raw_write(map,

						reg + (i * map->reg_stride),

						val + (i * val_bytes),

						val_bytes);

			if (ret != 0)

				goto out;

		}

	} else {



		ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);

	}



	if (val_bytes != 1)

		kfree(wval);



	}

out:

	map->unlock(map->lock_arg);

	return ret;