From patchwork Wed Aug 12 10:12:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 6999871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 233069F373 for ; Wed, 12 Aug 2015 10:18:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E19620304 for ; Wed, 12 Aug 2015 10:18:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7DCA5203F1 for ; Wed, 12 Aug 2015 10:18:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZPT4s-0001bj-B9; Wed, 12 Aug 2015 10:16:10 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZPT2x-0007Xu-2V for linux-arm-kernel@lists.infradead.org; Wed, 12 Aug 2015 10:14:15 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1ZPT2O-0008Uf-6Q; Wed, 12 Aug 2015 12:13:36 +0200 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.86) (envelope-from ) id 1ZPT2N-0001Do-97; Wed, 12 Aug 2015 12:13:35 +0200 From: Markus Pargmann To: Mark Brown , Jonathan Cameron Subject: [PATCH 05/20] regmap: Restructure writes in _regmap_raw_write() Date: Wed, 12 Aug 2015 12:12:30 +0200 Message-Id: <1439374365-20623-6-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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150812_031411_445910_F5A2AFA0 X-CRM114-Status: GOOD ( 15.35 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Srinivas Pandruvada , Markus Pargmann , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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);