[PATCH 11/20] regmap: _regmap_raw_read: Add handling of busses without bus->read()

Markus Pargmann mpa at pengutronix.de
Wed Aug 12 03:12:36 PDT 2015


Handle easy reads by using bus->reg_read(). Return with an error value
if a read is requested that can not be handled with reg_read().

Signed-off-by: Markus Pargmann <mpa at pengutronix.de>
---
 drivers/base/regmap/regmap.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 87f15fb60bc5..3b663350c573 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -2071,6 +2071,21 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
 
 	WARN_ON(!map->bus);
 
+	/*
+	 * There are busses that do not have a read function as it is optional.
+	 * Use their reg_read function instead if the requested number of bytes
+	 * is correct.
+	 */
+	if (!map->bus->read) {
+		/*
+		 * bus_reg_read() does not support reading values that are not
+		 * exactly the size of format.val_bytes
+		 */
+		if (val_len != map->format.val_bytes)
+			return -EINVAL;
+		return _regmap_bus_reg_read(map, reg, val);
+	}
+
 	range = _regmap_range_lookup(map, reg);
 	if (range) {
 		ret = _regmap_select_page(map, &reg, range,
-- 
2.4.6




More information about the linux-arm-kernel mailing list