From patchwork Tue Nov 28 20:51:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 842305 X-Patchwork-Delegate: bartekgola@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tk84xlKO"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ymbSl5LRkz9sNV for ; Wed, 29 Nov 2017 07:52:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751822AbdK1UwG (ORCPT ); Tue, 28 Nov 2017 15:52:06 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:37087 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753940AbdK1UwF (ORCPT ); Tue, 28 Nov 2017 15:52:05 -0500 Received: by mail-wm0-f67.google.com with SMTP id f140so2039770wmd.2 for ; Tue, 28 Nov 2017 12:52:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=p4MpDXorr0qfW9L7+rutvnfR491cGpa1+Hm7wW1PWIQ=; b=tk84xlKOk5NN1BsSZibdg0EdkTo/GpdOJM1L7U7MPZr3yjE48g3Tz9rUKj7T/hvYqw zVUqonCIliSXBuqmaFDR2A9APuTKqDBpZ6g+tYOwAYqe0XcxevvI4gw0faWZluuZd+tj C0QbVk3uRguIXKy1ahrgqMoQd3Cdb16Dk2x9g+POUgD8EVNJEumTOjpT8JE5qVeoKW2i NBpZkhOIeGfo4ZtTDIHWLZFwMZX/YfVWT8T0KkbpCs1wMpfK3yWamIsUiV0mPAg7l2Jk XveUR1ImKdwEaqa/PiEelfhEjnmDWVrugVYehEqyn+2wXtS2VeMASiz0INjPUF+dSupk KFog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=p4MpDXorr0qfW9L7+rutvnfR491cGpa1+Hm7wW1PWIQ=; b=FfU5B+aSXCnJfZcTFM+5iNqoRwVkH/o+0P2UAHE8KKFTKNSOfic6YdmOgCftRZgST6 7GAEvP+wxcsG5JST9D54PbLAv0yyBXl7d62/eE8SfCWDt7lQe29sjGjO3tdy9qsB6k+2 pCqIilZdHf3QJR8aTHVwqEDmkeizqOj412OcrTDXCz9IB44CAywEhDkx4tLruZYGSWLX uA8Lo+SqgEgzI/EwKX1ziP2zzhkoBG8SOKiYoTTtt33YxmLuXpJ80E/nMlnA2km5jBOT h6hTUQxtLHCYTbOWTasMpdfr6YiASZPs9UW7kpcGmPTO7ajzwvqy7f2k8do6mFfMlalh YU6A== X-Gm-Message-State: AJaThX4SJpoxPebafHI2l5DEsYVdHbZhxAnMekngKDHSBNwer9buHxC6 kTJ1gOrTxM61IhKnhaAt9V4ylQ== X-Google-Smtp-Source: AGs4zMYAY6Vcz/3dHHMlo4PdNsj5RFSHXNZ2VqTKdAKogMyydvqASs+KvqpHQahE6V+1SVR4uXUxqQ== X-Received: by 10.80.174.152 with SMTP id e24mr4414258edd.232.1511902324429; Tue, 28 Nov 2017 12:52:04 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:801a:35b6:3d85:3c9f? (p200300EA8BC0E400801A35B63D853C9F.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:801a:35b6:3d85:3c9f]) by smtp.googlemail.com with ESMTPSA id h56sm295546ede.15.2017.11.28.12.52.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Nov 2017 12:52:04 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v6 3/7] eeprom: at24: add regmap-based write function To: Bartosz Golaszewski Cc: "linux-i2c@vger.kernel.org" References: <328f770d-e79d-cbb5-1cd7-238862aa8e1c@gmail.com> Message-ID: Date: Tue, 28 Nov 2017 21:51:45 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <328f770d-e79d-cbb5-1cd7-238862aa8e1c@gmail.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Add a regmap-based write function. Signed-off-by: Heiner Kallweit --- v2: - rebased v3: - improve readability - re-introduce debug message v4: - no changes v5: - no changes v6: - no changes --- drivers/misc/eeprom/at24.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index a16e8ca12..c3c32ee88 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -538,6 +538,31 @@ static ssize_t at24_eeprom_write_smbus_byte(struct at24_data *at24, return -ETIMEDOUT; } +static ssize_t at24_regmap_write(struct at24_data *at24, const char *buf, + unsigned int offset, size_t count) +{ + unsigned long timeout, write_time; + struct at24_client *at24_client; + struct i2c_client *client; + struct regmap *regmap; + int ret; + + at24_client = at24_translate_offset(at24, &offset); + regmap = at24_client->regmap; + client = at24_client->client; + count = at24_adjust_write_count(at24, offset, count); + + loop_until_timeout(timeout, write_time) { + ret = regmap_bulk_write(regmap, offset, buf, count); + dev_dbg(&client->dev, "write %zu@%d --> %d (%ld)\n", + count, offset, ret, jiffies); + if (!ret) + return count; + } + + return -ETIMEDOUT; +} + static ssize_t at24_eeprom_write_i2c(struct at24_data *at24, const char *buf, unsigned int offset, size_t count) { @@ -661,7 +686,7 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) while (count) { int status; - status = at24->write_func(at24, buf, off, count); + status = at24_regmap_write(at24, buf, off, count); if (status < 0) { mutex_unlock(&at24->lock); pm_runtime_put(&client->dev);