[PATCH 05/20] regmap: Restructure writes in _regmap_raw_write()

Markus Pargmann
2015-08-12T10:16:53Z

Currently we try to write the data without copying directly using
bus->write() or bus->gather_write() if it exists. If one of the previous
tries to write reported -ENOTSUPP or none of them were usable, we copy
the data into a buffer and use bus->write().

However it does not make sense to try bus->write() a second time with a
copied buffer if it didn't work the first time.

This patch restructures this if/else block to make it clear that this is
not intended for the case where bus->write() returns -ENOTSUPP.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/base/regmap/regmap.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 86e94be3c749..f6bd3517a472 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1340,30 +1340,34 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg,
* send the work_buf directly, otherwise try to do a gather
* write.
*/
- if (val == work_val)
+ if (val == work_val) {
ret = map->bus->write(map->bus_context, map->work_buf,
map->format.reg_bytes +
map->format.pad_bytes +
val_len);
- else if (map->bus->gather_write)
- ret = map->bus->gather_write(map->bus_context, map->work_buf,
- map->format.reg_bytes +
- map->format.pad_bytes,
- val, val_len);
-
- /* If that didn't work fall back on linearising by hand. */
- if (ret == -ENOTSUPP) {
- len = map->format.reg_bytes + map->format.pad_bytes + val_len;
- buf = kzalloc(len, GFP_KERNEL);
- if (!buf)
- return -ENOMEM;
+ } else {
+ if (map->bus->gather_write)
+ ret = map->bus->gather_write(map->bus_context,
+ map->work_buf,
+ map->format.reg_bytes +
+ map->format.pad_bytes,
+ val, val_len);
+
+ /* If that didn't work fall back on linearising by hand. */
+ if (ret == -ENOTSUPP) {
+ len = map->format.reg_bytes + map->format.pad_bytes +
+ val_len;
+ buf = kzalloc(len, GFP_KERNEL);
+ if (!buf)
+ return -ENOMEM;

- memcpy(buf, map->work_buf, map->format.reg_bytes);
- memcpy(buf + map->format.reg_bytes + map->format.pad_bytes,
- val, val_len);
- ret = map->bus->write(map->bus_context, buf, len);
+ memcpy(buf, map->work_buf, map->format.reg_bytes);
+ memcpy(buf + map->format.reg_bytes +
+ map->format.pad_bytes, val, val_len);
+ ret = map->bus->write(map->bus_context, buf, len);

- kfree(buf);
+ kfree(buf);
+ }
}

trace_regmap_hw_write_done(map, reg, val_len / map->format.val_bytes);
--
2.4.6