Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751954AbbHLKNr (ORCPT ); Wed, 12 Aug 2015 06:13:47 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:47812 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753694AbbHLKNn (ORCPT ); Wed, 12 Aug 2015 06:13:43 -0400 From: Markus Pargmann To: Mark Brown , Jonathan Cameron Cc: Srinivas Pandruvada , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Markus Pargmann Subject: [PATCH 11/20] regmap: _regmap_raw_read: Add handling of busses without bus->read() Date: Wed, 12 Aug 2015 12:12:36 +0200 Message-Id: <1439374365-20623-12-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1439374365-20623-1-git-send-email-mpa@pengutronix.de> References: <1439374365-20623-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1384 Lines: 42 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 --- 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, ®, range, -- 2.4.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/