From patchwork Wed Jul 12 05:49:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 787016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3x6p2F62R7z9sNx for ; Wed, 12 Jul 2017 15:50:13 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IYbN+da9"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756689AbdGLFuN (ORCPT ); Wed, 12 Jul 2017 01:50:13 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36318 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756693AbdGLFuM (ORCPT ); Wed, 12 Jul 2017 01:50:12 -0400 Received: by mail-wr0-f195.google.com with SMTP id 77so3189140wrb.3 for ; Tue, 11 Jul 2017 22:50:12 -0700 (PDT) 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=HYoTloHbkXTNIpmuubYKHty8wTZSGKJt+PE8s06knBw=; b=IYbN+da9PmupGnwC4S+b5+fWCmLtsfD4+I+IdGkk8Jwu2Aypx1VxZUexHvXQqPsoqR gxQMwOBvvdv1XecIltZGTZVxOkcCEEhjzIiL1vB55RXZzfKEXh/TJTOadDNkH1dVU6E4 UrDf+uTNYDFaSKxbKayYhXZwYLc4ZzdLUwWg3SZiI7uZ8dN3c15/gGIT/PdLCu6CbIJ7 T2LvehIRu5QUqCNCWdlDzrGnPvaaP4aYsHQRyECrUzd4aNBIuc+DNCiZBUn6aLbPRO76 lwZxDzKMABSFgxfq9WWqx0MDzoIgFjfSEoALjLf3eFy/XcOZUgVaLHK/WKEMoI0sGcjo k7gQ== 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=HYoTloHbkXTNIpmuubYKHty8wTZSGKJt+PE8s06knBw=; b=jsxyaSK9KVk8VJ50aVnj3U8tb0839b7uXHc07rqRRxwa5QDaRSjii5VO+hqYOYoXKZ htam/S1XoUZtpVD/DWaRw/kGq7i4fPd+jojQuHPMUAI3muoj8vIxwHzg4XhIAjG/LxGl X4R4Wvtx+WOY+nwHCwcNdyDOzAFcblAmtwh6r6K7kvfnEhd4c/K0piRLJn9Y3T8+y6rT fz8dqCdHU3KsJf93OIVRWIHhSxkSYJWzVOlMpjNuDD48+VXKoObRvt2e5+DlpHHUCO/2 X93S5e3Uivqn9HeJkm0JQOyq0pB+h6ixDNJQWEPojsBkzwSywzqgfuKN/vg+GD8XaQaA /K8w== X-Gm-Message-State: AIVw113LfvUnzDwJRKstCf4YxNdz02bx2tfyontq676p+hzPFHn6ox6a Zs0iQLezs9YRqPKI X-Received: by 10.223.165.146 with SMTP id g18mr1597868wrc.167.1499838611154; Tue, 11 Jul 2017 22:50:11 -0700 (PDT) Received: from ?IPv6:2003:c6:ebc1:e200:4:ce91:c82d:34f2? (p200300C6EBC1E2000004CE91C82D34F2.dip0.t-ipconnect.de. [2003:c6:ebc1:e200:4:ce91:c82d:34f2]) by smtp.googlemail.com with ESMTPSA id 1sm1474848wmn.32.2017.07.11.22.50.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jul 2017 22:50:10 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 9/9] rtc: ds1307: remove member nvram_offset from struct ds1307 To: Alexandre Belloni Cc: linux-rtc@vger.kernel.org References: Message-ID: <24eaba2e-5ac5-aa7d-0434-61eebd9f516b@gmail.com> Date: Wed, 12 Jul 2017 07:49:54 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org Remove member nvram_offset from struct ds1307 and use the value stored in struct chip_desc directly. Signed-off-by: Heiner Kallweit --- drivers/rtc/rtc-ds1307.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 43babd74..6eb7e86e 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -116,7 +116,6 @@ enum ds_type { struct ds1307 { u8 regs[11]; - u16 nvram_offset; struct nvmem_config nvmem_cfg; enum ds_type type; unsigned long flags; @@ -918,8 +917,9 @@ static int ds1307_nvram_read(void *priv, unsigned int offset, void *val, size_t bytes) { struct ds1307 *ds1307 = priv; + const struct chip_desc *chip = &chips[ds1307->type]; - return regmap_bulk_read(ds1307->regmap, ds1307->nvram_offset + offset, + return regmap_bulk_read(ds1307->regmap, chip->nvram_offset + offset, val, bytes); } @@ -927,8 +927,9 @@ static int ds1307_nvram_write(void *priv, unsigned int offset, void *val, size_t bytes) { struct ds1307 *ds1307 = priv; + const struct chip_desc *chip = &chips[ds1307->type]; - return regmap_bulk_write(ds1307->regmap, ds1307->nvram_offset + offset, + return regmap_bulk_write(ds1307->regmap, chip->nvram_offset + offset, val, bytes); } @@ -1673,7 +1674,6 @@ static int ds1307_probe(struct i2c_client *client, ds1307->nvmem_cfg.reg_read = ds1307_nvram_read; ds1307->nvmem_cfg.reg_write = ds1307_nvram_write; ds1307->nvmem_cfg.priv = ds1307; - ds1307->nvram_offset = chip->nvram_offset; ds1307->rtc->nvmem_config = &ds1307->nvmem_cfg; ds1307->rtc->nvram_old_abi = true;