From patchwork Wed Nov 22 21:12:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 840523 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="Ib6dBtC6"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yhwCz6PvYz9s7B for ; Thu, 23 Nov 2017 08:13:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751681AbdKVVNQ (ORCPT ); Wed, 22 Nov 2017 16:13:16 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:44409 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751884AbdKVVNJ (ORCPT ); Wed, 22 Nov 2017 16:13:09 -0500 Received: by mail-wr0-f196.google.com with SMTP id l22so15770168wrc.11 for ; Wed, 22 Nov 2017 13:13:09 -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=wrlo9ev/wTuM4+cHdguzEK/WWKxhWsMHH3qtgeG5p8c=; b=Ib6dBtC6n28LQBxBAo+JmT1YCEzl0KzrqVuWj0uLkALHWJnKskNAJNAzmcf1IYD0rK cXsrLcSUMnNpuUrBKXJbYCTL809WN1IK3k0tJX388HpYUzH6X0JDc/WBmlaXnJmX8bx6 WS9n8TZyhp0TYjv854zcpTgBuktFQ5qXBtjRau3Qf+7vF/c8QAI7t2nnehx6d+gkqCZk 9D9/P6IAhT8Knzl6pYprjQLhO9uR6zf9/PibJkuLUJEisdBFLrVlm1xqiwYZJSfCBQ5C ZdL6tn/LlXhZcS5UrJ2bANpa6xmFGWC5AYPu3L6uQR9TBNU40cSmsnl9e/Or/4sldX7U cxwA== 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=wrlo9ev/wTuM4+cHdguzEK/WWKxhWsMHH3qtgeG5p8c=; b=KB7Hb0jZNmN8nN2/JyAYjyhM94HrPZVaNfMdoVNVNaq/tEsrH4uWnalKEcNHexD5v/ VyRZt0gmF782iIDQUF/O3si4NfxiHqD7jcfFKuKkfjEzbOv5m3JZMG1s6pUKIMk2ELij 0y1/r88zf0jhwScr/RFvSeK/UQNDR9ugMgcAEvlbnMEvaPOvshfOYcHn0aUwF3j2gi1g B3HTGXVIsy2qfnNKSdu27xFe/OwN51Alz1YEGM47EHzze/B16ciDG76CC5GVpHUws0ME ZoVjp8LnQHA08OzccjgoZknkc5p3zeQJlMkCG3gOrXBC/T8EZVVyiU4cHXYgcnIzrcnO d8UQ== X-Gm-Message-State: AJaThX7wXtJV6ziZFRMqeDB7cd3m7FvATejFeQkYcU0xwzaWpLgicaLP kf6jruw5RtdiBQhMzvdCzzcUaw== X-Google-Smtp-Source: AGs4zMaPqgVU49lDdBf8r8gGRT63bcsuGO59GkvVWlh3pUWhzNuBRVBA1LlJD7Ijs2DJnHbsDBkTZA== X-Received: by 10.223.157.27 with SMTP id k27mr14755471wre.153.1511385188337; Wed, 22 Nov 2017 13:13:08 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:58ac:8788:9665:db13? (p200300EA8BC0E40058AC87889665DB13.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:58ac:8788:9665:db13]) by smtp.googlemail.com with ESMTPSA id 16sm16523998wrt.81.2017.11.22.13.13.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 13:13:07 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v4 2/7] eeprom: at24: change at24_translate_offset return type To: Bartosz Golaszewski Cc: "linux-i2c@vger.kernel.org" References: <0448eec2-7dfb-ca79-d03a-d5b7fcb5d76c@gmail.com> Message-ID: <60d58343-c9c3-a209-d71f-ce5fbe08169d@gmail.com> Date: Wed, 22 Nov 2017 22:12:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <0448eec2-7dfb-ca79-d03a-d5b7fcb5d76c@gmail.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Change return type of at24_translate_offset to *at24_client to make member regmap accessible for subsequent patches of this series. Signed-off-by: Heiner Kallweit --- v2: - rebased v3: - improve readability v4: - no changes --- drivers/misc/eeprom/at24.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 911cce8ec..fe4393ad6 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -267,8 +267,8 @@ MODULE_DEVICE_TABLE(acpi, at24_acpi_ids); * one "eeprom" file not four, but larger reads would fail when * they crossed certain pages. */ -static struct i2c_client *at24_translate_offset(struct at24_data *at24, - unsigned int *offset) +static struct at24_client *at24_translate_offset(struct at24_data *at24, + unsigned int *offset) { unsigned i; @@ -280,17 +280,19 @@ static struct i2c_client *at24_translate_offset(struct at24_data *at24, *offset &= 0xff; } - return at24->client[i].client; + return &at24->client[i]; } static ssize_t at24_eeprom_read_smbus(struct at24_data *at24, char *buf, unsigned int offset, size_t count) { unsigned long timeout, read_time; + struct at24_client *at24_client; struct i2c_client *client; int status; - client = at24_translate_offset(at24, &offset); + at24_client = at24_translate_offset(at24, &offset); + client = at24_client->client; if (count > io_limit) count = io_limit; @@ -318,13 +320,15 @@ static ssize_t at24_eeprom_read_i2c(struct at24_data *at24, char *buf, unsigned int offset, size_t count) { unsigned long timeout, read_time; + struct at24_client *at24_client; struct i2c_client *client; struct i2c_msg msg[2]; int status, i; u8 msgbuf[2]; memset(msg, 0, sizeof(msg)); - client = at24_translate_offset(at24, &offset); + at24_client = at24_translate_offset(at24, &offset); + client = at24_client->client; if (count > io_limit) count = io_limit; @@ -368,12 +372,14 @@ static ssize_t at24_eeprom_read_serial(struct at24_data *at24, char *buf, unsigned int offset, size_t count) { unsigned long timeout, read_time; + struct at24_client *at24_client; struct i2c_client *client; struct i2c_msg msg[2]; u8 addrbuf[2]; int status; - client = at24_translate_offset(at24, &offset); + at24_client = at24_translate_offset(at24, &offset); + client = at24_client->client; memset(msg, 0, sizeof(msg)); msg[0].addr = client->addr; @@ -421,12 +427,14 @@ static ssize_t at24_eeprom_read_mac(struct at24_data *at24, char *buf, unsigned int offset, size_t count) { unsigned long timeout, read_time; + struct at24_client *at24_client; struct i2c_client *client; struct i2c_msg msg[2]; u8 addrbuf[2]; int status; - client = at24_translate_offset(at24, &offset); + at24_client = at24_translate_offset(at24, &offset); + client = at24_client->client; memset(msg, 0, sizeof(msg)); msg[0].addr = client->addr; @@ -478,10 +486,12 @@ static ssize_t at24_eeprom_write_smbus_block(struct at24_data *at24, unsigned int offset, size_t count) { unsigned long timeout, write_time; + struct at24_client *at24_client; struct i2c_client *client; ssize_t status = 0; - client = at24_translate_offset(at24, &offset); + at24_client = at24_translate_offset(at24, &offset); + client = at24_client->client; count = at24_adjust_write_count(at24, offset, count); loop_until_timeout(timeout, write_time) { @@ -505,10 +515,12 @@ static ssize_t at24_eeprom_write_smbus_byte(struct at24_data *at24, unsigned int offset, size_t count) { unsigned long timeout, write_time; + struct at24_client *at24_client; struct i2c_client *client; ssize_t status = 0; - client = at24_translate_offset(at24, &offset); + at24_client = at24_translate_offset(at24, &offset); + client = at24_client->client; loop_until_timeout(timeout, write_time) { status = i2c_smbus_write_byte_data(client, offset, buf[0]); @@ -529,12 +541,14 @@ static ssize_t at24_eeprom_write_i2c(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 i2c_msg msg; ssize_t status = 0; int i = 0; - client = at24_translate_offset(at24, &offset); + at24_client = at24_translate_offset(at24, &offset); + client = at24_client->client; count = at24_adjust_write_count(at24, offset, count); msg.addr = client->addr; @@ -567,6 +581,7 @@ static ssize_t at24_eeprom_write_i2c(struct at24_data *at24, const char *buf, static int at24_read(void *priv, unsigned int off, void *val, size_t count) { struct at24_data *at24 = priv; + struct at24_client *at24_client; struct i2c_client *client; char *buf = val; int ret; @@ -574,7 +589,8 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count) if (unlikely(!count)) return count; - client = at24_translate_offset(at24, &off); + at24_client = at24_translate_offset(at24, &off); + client = at24_client->client; ret = pm_runtime_get_sync(&client->dev); if (ret < 0) { @@ -612,6 +628,7 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count) static int at24_write(void *priv, unsigned int off, void *val, size_t count) { struct at24_data *at24 = priv; + struct at24_client *at24_client; struct i2c_client *client; char *buf = val; int ret; @@ -619,7 +636,8 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) if (unlikely(!count)) return -EINVAL; - client = at24_translate_offset(at24, &off); + at24_client = at24_translate_offset(at24, &off); + client = at24_client->client; ret = pm_runtime_get_sync(&client->dev); if (ret < 0) {