lkml.org 
[lkml]   [2018]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 4/5] regmap: Tidy up regmap_raw_write chunking code
Date
Raw writes may need to be split into small chunks if max_raw_write is
set. Tidy up the code implementing this, the new code is slightly
clearer, slightly shorter and slightly more efficient.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
drivers/base/regmap/regmap.c | 37 ++++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index dd17e2e7a3d7..6809b33d6ab1 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1814,40 +1814,35 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
{
size_t val_bytes = map->format.val_bytes;
size_t val_count = val_len / val_bytes;
- int chunk_stride = map->reg_stride;
- size_t chunk_size = val_bytes;
- size_t chunk_count = val_count;
+ size_t chunk_count, chunk_bytes;
+ size_t chunk_regs = val_count;
int ret, i;

if (!val_count)
return -EINVAL;

- if (!map->use_single_write) {
- if (map->max_raw_write)
- chunk_size = map->max_raw_write;
- else
- chunk_size = val_len;
- if (chunk_size % val_bytes)
- chunk_size -= chunk_size % val_bytes;
- chunk_count = val_len / chunk_size;
- chunk_stride *= chunk_size / val_bytes;
- }
+ if (map->use_single_write)
+ chunk_regs = 1;
+ else if (map->max_raw_write && val_len > map->max_raw_write)
+ chunk_regs = map->max_raw_write / val_bytes;
+
+ chunk_count = val_count / chunk_regs;
+ chunk_bytes = chunk_regs * val_bytes;

/* Write as many bytes as possible with chunk_size */
for (i = 0; i < chunk_count; i++) {
- ret = _regmap_raw_write_impl(map,
- reg + (i * chunk_stride),
- val + (i * chunk_size),
- chunk_size);
+ ret = _regmap_raw_write_impl(map, reg, val, chunk_bytes);
if (ret)
return ret;
+
+ reg += regmap_get_offset(map, chunk_regs);
+ val += chunk_bytes;
+ val_len -= chunk_bytes;
}

/* Write remaining bytes */
- if (!ret && chunk_size * i < val_len)
- ret = _regmap_raw_write_impl(map, reg + (i * chunk_stride),
- val + (i * chunk_size),
- val_len - i * chunk_size);
+ if (val_len)
+ ret = _regmap_raw_write_impl(map, reg, val, val_len);

return ret;
}
--
2.11.0
\
 
 \ /
  Last update: 2018-02-22 14:02    [W:0.057 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site