From patchwork Fri Sep 4 15:21:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=R5Dqco5V; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhHD6Cyzz9sV7 for ; Sat, 5 Sep 2020 01:22:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730300AbgIDPVn (ORCPT ); Fri, 4 Sep 2020 11:21:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730237AbgIDPVY (ORCPT ); Fri, 4 Sep 2020 11:21:24 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D05D6C061246 for ; Fri, 4 Sep 2020 08:21:23 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id g4so7137753wrs.5 for ; Fri, 04 Sep 2020 08:21:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=stUHoXBLhmGzCwZtEJAUKXLxs5aOWuJj0Ee8wOeFjkw=; b=R5Dqco5Vp40iB/h46/HNZAv1XlB31sJ1uLGZz0PIHiNSuFyPEIvqOG0s3JiYF+lh3u DurSlxoDn/IFY+Fbf5xSfktwwY5BC84nKcYoiG8OR5b1/efxzcT2XWjZAPsadyfJskzF oHaVA+C2KEV7MKjlE0XUBbHp3MXCuih647KUKkedt85whqODx3C2FEopKhUim+AOuB0U E5GPclZWVElCYYr+ofk7B9yjyHzhgWjKrwfgx63n+Eq18kgjNg95pQarqWmU6Xl2gCSX +HnJE8kCQ4VctMsImFS8lFPAD00bcCs2JXlkAM3c5Zeqld1EIAshT8hcndkPjtrZz3TM lzMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=stUHoXBLhmGzCwZtEJAUKXLxs5aOWuJj0Ee8wOeFjkw=; b=h1Y4k2rXaVu7QfLKkLopeoN46IIeHtVaCqBrJvA5YYs2WrThfCQB2qtW0DDaUiODrw OVxHBKZz3jdIWkoQPmPXGVk849cwpHcS9blv+srcg0x2VRzG15aUaAA+0wEFRDtOIg8e OxaaThyvnQd8BdITma0u2xBjbKLQ8TFNkiAJfD/IPDc2Jo+NBKrycJOB+EONgvIFJr8R 6a7TLsHEfriUHP6R2P1/KoaORKZ9kSmmvHO1XCgwg3xpwZBqyVJmiknkyqWGm/EC944r MT5DW2pn+bIWXY4HDg79CTX+D/23uxjGqwp58Q+A6LtdqqcStAh1brjly1Z8eDDxnCjJ 0Mug== X-Gm-Message-State: AOAM533peq7hW0OTLcMl5/uHJnxoaeGjKUqpslhXBW61z+mlIKMYLQyt +ZN21h+OuR3xHAeMkYQxEAJ/LA== X-Google-Smtp-Source: ABdhPJwl7Nn/2R7VILQzKg8oX0n4CU6PnnWJQYviy0/NYR2eE/0FgjwSs2ONiVU4fkwPEDEObs/jPA== X-Received: by 2002:adf:94c1:: with SMTP id 59mr8817819wrr.29.1599232882017; Fri, 04 Sep 2020 08:21:22 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:21 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 1/8] rtc: rx8010: remove unnecessary parentheses Date: Fri, 4 Sep 2020 17:21:09 +0200 Message-Id: <20200904152116.2157-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski Remove parentheses whenever they guard a single line. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index fe010151ec8f..2faf5357a3a5 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -181,9 +181,8 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) return ret; flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); - if (flagreg < 0) { + if (flagreg < 0) return flagreg; - } if (flagreg & RX8010_FLAG_VLF) ret = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG, @@ -284,17 +283,15 @@ static int rx8010_set_alarm(struct device *dev, struct rtc_wkalrm *t) int err; flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG); - if (flagreg < 0) { + if (flagreg < 0) return flagreg; - } if (rx8010->ctrlreg & (RX8010_CTRL_AIE | RX8010_CTRL_UIE)) { rx8010->ctrlreg &= ~(RX8010_CTRL_AIE | RX8010_CTRL_UIE); err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, rx8010->ctrlreg); - if (err < 0) { + if (err < 0) return err; - } } flagreg &= ~RX8010_FLAG_AF; From patchwork Fri Sep 4 15:21:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=hG22uCLi; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhHw5v4Dz9sTg for ; Sat, 5 Sep 2020 01:22:36 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730898AbgIDPWg (ORCPT ); Fri, 4 Sep 2020 11:22:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730301AbgIDPV0 (ORCPT ); Fri, 4 Sep 2020 11:21:26 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2053EC061249 for ; Fri, 4 Sep 2020 08:21:25 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id z9so6452273wmk.1 for ; Fri, 04 Sep 2020 08:21:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4PF6iUUI6SI+SJ6z3aC7j/JhZxFAycexdCgWf22To5o=; b=hG22uCLiFR7asAwpfTFSwQU1iT/gHSJGscx3xXml/kyxE1JnDfx2MImY/2H1R8hLKJ KfCjg6MZKknAkIKZotyKG6V6+B4nonb97c3ZWtPawkNO8Jkk2A4zk1b4rjfuNlZFAIMP 7Nengc5DlafgZ1S+i4Vx+EqWWER+cB9wNIsVMWDs8lbGwmw97s+ZL173l3s2Obdzotar ayKP7cRX4JqUx2ALb/DjcNiWn377sT5SR3DGB9Laa8iyUktr0lOizPQHLFHIvu6DI1kx i/crp9Xnio/Y+MqlzSjqheLANh0YjRxvrEgBrOsSZkzu7pWuJiKCVnHyQ9qzaIcp66vt JHtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4PF6iUUI6SI+SJ6z3aC7j/JhZxFAycexdCgWf22To5o=; b=eMLSaUZB4DuhTxfvbjk8hHLBoruMdZwNKPJf375fAyWGg0hre4SRuntsiqv6oBph9M q5rZOMh0WMmjWZCu7Eqas6sfzlsycFKTQ+eOCt1vgZt/BTyyR7fpAGoJZhOfVedi6891 EJvEt1ATI13rzjoHC/dPoMpHs8Ol7GvGpMLCu1gRv7V8Reo2aJWAHbBZCOovS2wpYJzI Zq+sRDR8yw6zauau2HnFlhRnFCt4NG8XIrkupACj1H2Dac+DixMH/rEKjdpIwKoqGI12 uIscGZx9sCbpNbdDOqz1ENLEymWUuHVll1EO6J6fj1bo73ZVct0OrIJ0hLd1sR974jMt 2YhQ== X-Gm-Message-State: AOAM533RoufCw5TQck6zEhZ+mh5Z4e0fVLhnlt4Si4yOSjgAFgv3L5Tk HAbBu+/sps1hUX+gcGu4nSGoYQ== X-Google-Smtp-Source: ABdhPJzwZNrCv4oELX+wCyr/BptjE1Vzk+IEHthZyONGkq5f0OG68w9UJLc9TtP8XmHM+y68jgRZMQ== X-Received: by 2002:a1c:7d4d:: with SMTP id y74mr8082237wmc.73.1599232883838; Fri, 04 Sep 2020 08:21:23 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:23 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 2/8] rtc: rx8010: consolidate local variables of the same type Date: Fri, 4 Sep 2020 17:21:10 +0200 Message-Id: <20200904152116.2157-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski Move local variables of the same type into a single line for better readability. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index 2faf5357a3a5..4c790d33f589 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -109,8 +109,7 @@ static int rx8010_get_time(struct device *dev, struct rtc_time *dt) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); u8 date[7]; - int flagreg; - int err; + int flagreg, err; flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); if (flagreg < 0) @@ -141,8 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); u8 date[7]; - int ctrl, flagreg; - int ret; + int ctrl, flagreg, ret; if ((dt->tm_year < 100) || (dt->tm_year > 199)) return -EINVAL; @@ -250,8 +248,7 @@ static int rx8010_read_alarm(struct device *dev, struct rtc_wkalrm *t) struct rx8010_data *rx8010 = dev_get_drvdata(dev); struct i2c_client *client = rx8010->client; u8 alarmvals[3]; - int flagreg; - int err; + int flagreg, err; err = i2c_smbus_read_i2c_block_data(client, RX8010_ALMIN, 3, alarmvals); if (err != 3) @@ -279,8 +276,7 @@ static int rx8010_set_alarm(struct device *dev, struct rtc_wkalrm *t) struct i2c_client *client = to_i2c_client(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev); u8 alarmvals[3]; - int extreg, flagreg; - int err; + int extreg, flagreg, err; flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG); if (flagreg < 0) @@ -346,9 +342,8 @@ static int rx8010_alarm_irq_enable(struct device *dev, { struct i2c_client *client = to_i2c_client(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev); - int flagreg; + int flagreg, err; u8 ctrl; - int err; ctrl = rx8010->ctrlreg; @@ -387,8 +382,7 @@ static int rx8010_alarm_irq_enable(struct device *dev, static int rx8010_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); - int tmp; - int flagreg; + int tmp, flagreg; switch (cmd) { case RTC_VL_READ: From patchwork Fri Sep 4 15:21:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=okftafqQ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhHm4D57z9sV7 for ; Sat, 5 Sep 2020 01:22:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730889AbgIDPW1 (ORCPT ); Fri, 4 Sep 2020 11:22:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730476AbgIDPV2 (ORCPT ); Fri, 4 Sep 2020 11:21:28 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D07C5C061251 for ; Fri, 4 Sep 2020 08:21:26 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id a17so7112777wrn.6 for ; Fri, 04 Sep 2020 08:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=41Qpf9U4SrfFhPD50QAUNJfCt0M/GeyQmwAlMT5vSWE=; b=okftafqQMXRcABXmeAaH6FT2kjmQmoEkLdsZzFvtoSabJBIq8tnlJyNt0w2/SXtbU1 zAZp7mGzAYrjSdO6SpoR0EOKo7dBNtI0J/uXB8IduamXjqWUxfFbh1LA3ErY/1Ew4Mop nvhl3J0132Zttgkx1B0FeE589baLLNUCv5Wd0S5qewpEVxrqxzlK+RnGqeoKCAjpqz1m LhOVA1SvB0EcbOFAT+vQ2hsm4F9pjWgCe2U/6oC4gpv4Rs2Ueds/YgahqfoOTqLw0ZyX hCyhwNRWemvdVtTZzemwtN7U2y39fbhD+tEoKKvgtlKtEVkYX3EACXxV2H15MzOb60c8 4fTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=41Qpf9U4SrfFhPD50QAUNJfCt0M/GeyQmwAlMT5vSWE=; b=X374DU8wu9x4O7dLKrBDjM5PAiJj2PBcZZjzkEWMOIc+Cmpyuvb8M1EvNfGuxtbthw A+xjohCwtovdFpjFnQU0cs63pVp4eBIpcmNAujRHXNN2NdOE66/n2Tgx5qNV50qpszIs tn9mN2K8n+goYUF+tkKd6k3iHsyEoMy1G2iQmGoH81h9ab2qXxwsPkgg7P/vAsaWFMPt So7b3V4d6AftY8QeXlAbybWqdpGED/+CcbvKcpQJXfASSr67Abz7sDSfyiY87lt1xRzp 71vTap+2De8SKNMo3Hj+FZNm8ZM/Omf6ZizwQIRMhSoJPUmBJW8HwapUYKbKuKhkou2G 3lww== X-Gm-Message-State: AOAM531Uy6Htcm74JY9HmcKVDSH2SyOaQP4cYfU3KjYh7lTEnRiUuPo7 4MP9gYrWLB861kpzo4uhqikxvg== X-Google-Smtp-Source: ABdhPJyBwyfuS8JLYCUpzdLvZ2JVLMxKXzI5OWO3X4lAHWfZFyWWvU3gWZqvRDM/AoKC5pNb8Zhrzg== X-Received: by 2002:adf:81c6:: with SMTP id 64mr7867716wra.176.1599232885571; Fri, 04 Sep 2020 08:21:25 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:25 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 3/8] rtc: rx8010: use tabs for instead of spaces for code formatting Date: Fri, 4 Sep 2020 17:21:11 +0200 Message-Id: <20200904152116.2157-4-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski The define values in this driver are close to their names and they are separated by spaces. Use tabs instead and align all defines. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 58 ++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index 4c790d33f589..2038700a3e8e 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -13,40 +13,40 @@ #include #include -#define RX8010_SEC 0x10 -#define RX8010_MIN 0x11 -#define RX8010_HOUR 0x12 -#define RX8010_WDAY 0x13 -#define RX8010_MDAY 0x14 -#define RX8010_MONTH 0x15 -#define RX8010_YEAR 0x16 -#define RX8010_RESV17 0x17 -#define RX8010_ALMIN 0x18 -#define RX8010_ALHOUR 0x19 -#define RX8010_ALWDAY 0x1A -#define RX8010_TCOUNT0 0x1B -#define RX8010_TCOUNT1 0x1C -#define RX8010_EXT 0x1D -#define RX8010_FLAG 0x1E -#define RX8010_CTRL 0x1F +#define RX8010_SEC 0x10 +#define RX8010_MIN 0x11 +#define RX8010_HOUR 0x12 +#define RX8010_WDAY 0x13 +#define RX8010_MDAY 0x14 +#define RX8010_MONTH 0x15 +#define RX8010_YEAR 0x16 +#define RX8010_RESV17 0x17 +#define RX8010_ALMIN 0x18 +#define RX8010_ALHOUR 0x19 +#define RX8010_ALWDAY 0x1A +#define RX8010_TCOUNT0 0x1B +#define RX8010_TCOUNT1 0x1C +#define RX8010_EXT 0x1D +#define RX8010_FLAG 0x1E +#define RX8010_CTRL 0x1F /* 0x20 to 0x2F are user registers */ -#define RX8010_RESV30 0x30 -#define RX8010_RESV31 0x31 -#define RX8010_IRQ 0x32 +#define RX8010_RESV30 0x30 +#define RX8010_RESV31 0x31 +#define RX8010_IRQ 0x32 -#define RX8010_EXT_WADA BIT(3) +#define RX8010_EXT_WADA BIT(3) -#define RX8010_FLAG_VLF BIT(1) -#define RX8010_FLAG_AF BIT(3) -#define RX8010_FLAG_TF BIT(4) -#define RX8010_FLAG_UF BIT(5) +#define RX8010_FLAG_VLF BIT(1) +#define RX8010_FLAG_AF BIT(3) +#define RX8010_FLAG_TF BIT(4) +#define RX8010_FLAG_UF BIT(5) -#define RX8010_CTRL_AIE BIT(3) -#define RX8010_CTRL_UIE BIT(5) -#define RX8010_CTRL_STOP BIT(6) -#define RX8010_CTRL_TEST BIT(7) +#define RX8010_CTRL_AIE BIT(3) +#define RX8010_CTRL_UIE BIT(5) +#define RX8010_CTRL_STOP BIT(6) +#define RX8010_CTRL_TEST BIT(7) -#define RX8010_ALARM_AE BIT(7) +#define RX8010_ALARM_AE BIT(7) static const struct i2c_device_id rx8010_id[] = { { "rx8010", 0 }, From patchwork Fri Sep 4 15:21:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Ilb28TMf; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhHm0GrZz9sTg for ; Sat, 5 Sep 2020 01:22:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730882AbgIDPWY (ORCPT ); Fri, 4 Sep 2020 11:22:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730727AbgIDPV3 (ORCPT ); Fri, 4 Sep 2020 11:21:29 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA42FC06125C for ; Fri, 4 Sep 2020 08:21:27 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id w2so6435901wmi.1 for ; Fri, 04 Sep 2020 08:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0uif8G7qHTGRhCmGeHPmCwg86SJ2eGD23rP8ij/IiTw=; b=Ilb28TMfg4uo67ZfwyzeEk/tbFpBcLHskbaHfCkZefZJv7c+N6XEFnVT439XAFb9k1 V5++oXIEY4Rv03Opj/9JbiTlh/NceXPQ3QvwqTc72OXlDwNCruSfXHpO83w9S4sxswKN MPC839CR5hdleTR+524c8W5Qan0HT7ad8o9uZT+S4On2phkJPxsBGe8/bU2rQgWuwNnf gbCzfDb9Ko/gv8iEsXU3d6+Xw66zCeBvl/tZgoZThGvcswPv4EpKNhrxwcpYHG28nTDj ngiqTYQucFKxuvq8QILU8vUMW+Y4IkCyOqYuQebPZRmdxr6WZZBM7kI856d4EovK8ecA pdLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0uif8G7qHTGRhCmGeHPmCwg86SJ2eGD23rP8ij/IiTw=; b=IzIkvZmXCUCi9/O/haEKZTx4YpoUy22nTEAEli8cGFFEZi5a3FoqxuuPY/SGqccCRE 6SUW2O/WsfIAyKFB4aIjM3KR46qxYfdZrtN1EbcRYkG5P0OCaJH9stS1aLoCBXIuHZ+C TuF1JDpl8xk8bSGpLM7VlMsNUrix3nR7InXDcX5wWbGcNIyaLTRvSzzroKPcsXkRlDhU T4d8/2GiS9UqQKRdahAk7ZlNlLLZqiUIGGfwvrQpY7wEp9a2+Iz8V/3GpoJK/mKRrWlG jo8wRcSjIxNKmHHaAd42wYMWAJ017ClCVOaUKWWK7fDvRXawaMJs7fLlOexGqIm0ieV/ m5lw== X-Gm-Message-State: AOAM532bT7AgdH8Qt0AVYvCrpGmJ7efvcAcYO14xIivRRxM5v+lzQFSH yzfz6JxkFFxtyp9mtzeCQ2C44Q== X-Google-Smtp-Source: ABdhPJwReXIbSBcaWjilKYJdCmgalWKDDkGAhjHOmGsTWimou4pWtVIAHL5BLnlyUHrs9otkFQskoQ== X-Received: by 2002:a1c:a3c4:: with SMTP id m187mr8606644wme.159.1599232886611; Fri, 04 Sep 2020 08:21:26 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:26 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 4/8] rtc: rx8010: rename ret to err in rx8010_set_time() Date: Fri, 4 Sep 2020 17:21:12 +0200 Message-Id: <20200904152116.2157-5-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski All other functions in this driver use 'err' for integer return values. Do the same in rx8010_set_time() for consistency. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index 2038700a3e8e..67ff06a76629 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -140,7 +140,7 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); u8 date[7]; - int ctrl, flagreg, ret; + int ctrl, flagreg, err; if ((dt->tm_year < 100) || (dt->tm_year > 199)) return -EINVAL; @@ -150,10 +150,10 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) if (ctrl < 0) return ctrl; rx8010->ctrlreg = ctrl | RX8010_CTRL_STOP; - ret = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, + err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, rx8010->ctrlreg); - if (ret < 0) - return ret; + if (err < 0) + return err; date[RX8010_SEC - RX8010_SEC] = bin2bcd(dt->tm_sec); date[RX8010_MIN - RX8010_SEC] = bin2bcd(dt->tm_min); @@ -163,27 +163,27 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) date[RX8010_YEAR - RX8010_SEC] = bin2bcd(dt->tm_year - 100); date[RX8010_WDAY - RX8010_SEC] = bin2bcd(1 << dt->tm_wday); - ret = i2c_smbus_write_i2c_block_data(rx8010->client, + err = i2c_smbus_write_i2c_block_data(rx8010->client, RX8010_SEC, 7, date); - if (ret < 0) - return ret; + if (err < 0) + return err; /* clear STOP bit after changing clock/calendar */ ctrl = i2c_smbus_read_byte_data(rx8010->client, RX8010_CTRL); if (ctrl < 0) return ctrl; rx8010->ctrlreg = ctrl & ~RX8010_CTRL_STOP; - ret = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, + err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, rx8010->ctrlreg); - if (ret < 0) - return ret; + if (err < 0) + return err; flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); if (flagreg < 0) return flagreg; if (flagreg & RX8010_FLAG_VLF) - ret = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG, + err = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG, flagreg & ~RX8010_FLAG_VLF); return 0; From patchwork Fri Sep 4 15:21:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357599 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=N2blinJj; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhH0332Bz9sV7 for ; Sat, 5 Sep 2020 01:21:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730316AbgIDPVp (ORCPT ); Fri, 4 Sep 2020 11:21:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730771AbgIDPVa (ORCPT ); Fri, 4 Sep 2020 11:21:30 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC56AC06125E for ; Fri, 4 Sep 2020 08:21:28 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id z4so7136108wrr.4 for ; Fri, 04 Sep 2020 08:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c+NW3ywAC/uanmt42NpnVbbuokCChZKYNRWziVF2DC4=; b=N2blinJjlupo88maqUS5WAVYUyr4cxdQ/rPg+8LSJY7CEPEpxcFJhypybzP5x7Z/Nm yAJhPV3cpxBcd60hXygcgcH7AR+nGWKLfJ7Cv5dpnUe0tLctk2M9ZFINwnFcTZF3ydz7 DlBED3Hz2zkW54uoD/Gtdl2ITJrjDCHDqDOEzOFM1KFx+luO59Nhad90V+4GY9Gfv8yl 9n7/6UlXhxjWci5hFnYNAj6edZWfWEOSG25t4zJdYFZEvyp1qZEJPGXDVqW8BuWIiqlK IiSYTF/YNhPQh/feA5TbMizHcAvFnuKdOGYEuV4NsENV+rVTG76FVmKlFx31zFNA+Cdm 21xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c+NW3ywAC/uanmt42NpnVbbuokCChZKYNRWziVF2DC4=; b=X1bOXF6yLznsbeWQrrJEolMmDJ26D+6WkZm60bD7iYblpk/Crcuq1PRIuxJn9pSf8+ xrmuueJkzrqJCJcTCe4K7gvG1E9fdQ9X5s90a1i+Z4K06Ie3mhJuIrakVLZG4YyW1+Qk C9bMm+6hMrbAfGTrGYz0ejSBevR590DURhWIgCmKqjpKeHjwSYhiwlfawDVzjqZIll42 WRNq6fLkyn2i79d3/Vm4v8jfx3QAjkKWOK+l6O8egzQKfWt+fZD7H3oV4zhm6E/Hq/XK J84SiNkHm2Fae8nXE9r5DhBT2yGXCiMDbHTyrhVaYc4LuZBHMj38HLZPT9Xt0PKSbafF kQLA== X-Gm-Message-State: AOAM532ht2I95lx/g4ffwNR7q5rlWimU8rEKr7qdBMv4YXlx/Khnk+CC 8aHhEqFkB4nzNQuCB5PtyChjCw== X-Google-Smtp-Source: ABdhPJyuKewa1rTm4mj8n8YuA7Q4/uIFSQWnj17ML08IvCmIMK67PeeWiPxQqKEku7qkH3WDhX5R1A== X-Received: by 2002:adf:f44d:: with SMTP id f13mr2605254wrp.224.1599232887545; Fri, 04 Sep 2020 08:21:27 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:27 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 5/8] rtc: rx8010: don't use magic values for time buffer length Date: Fri, 4 Sep 2020 17:21:13 +0200 Message-Id: <20200904152116.2157-6-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski The time buffer len is used directly in this driver. For readability it's better to define a constant. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index 67ff06a76629..f3bed7be2533 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -48,6 +48,8 @@ #define RX8010_ALARM_AE BIT(7) +#define RX8010_TIME_BUF_LEN 7 + static const struct i2c_device_id rx8010_id[] = { { "rx8010", 0 }, { } @@ -108,7 +110,7 @@ static irqreturn_t rx8010_irq_1_handler(int irq, void *dev_id) static int rx8010_get_time(struct device *dev, struct rtc_time *dt) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); - u8 date[7]; + u8 date[RX8010_TIME_BUF_LEN]; int flagreg, err; flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); @@ -121,8 +123,8 @@ static int rx8010_get_time(struct device *dev, struct rtc_time *dt) } err = i2c_smbus_read_i2c_block_data(rx8010->client, RX8010_SEC, - 7, date); - if (err != 7) + RX8010_TIME_BUF_LEN, date); + if (err != RX8010_TIME_BUF_LEN) return err < 0 ? err : -EIO; dt->tm_sec = bcd2bin(date[RX8010_SEC - RX8010_SEC] & 0x7f); @@ -139,7 +141,7 @@ static int rx8010_get_time(struct device *dev, struct rtc_time *dt) static int rx8010_set_time(struct device *dev, struct rtc_time *dt) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); - u8 date[7]; + u8 date[RX8010_TIME_BUF_LEN]; int ctrl, flagreg, err; if ((dt->tm_year < 100) || (dt->tm_year > 199)) @@ -164,7 +166,8 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) date[RX8010_WDAY - RX8010_SEC] = bin2bcd(1 << dt->tm_wday); err = i2c_smbus_write_i2c_block_data(rx8010->client, - RX8010_SEC, 7, date); + RX8010_SEC, RX8010_TIME_BUF_LEN, + date); if (err < 0) return err; From patchwork Fri Sep 4 15:21:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357598 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=MfZkEE7G; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhGy334Cz9sTg for ; Sat, 5 Sep 2020 01:21:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730237AbgIDPVo (ORCPT ); Fri, 4 Sep 2020 11:21:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730781AbgIDPVa (ORCPT ); Fri, 4 Sep 2020 11:21:30 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BAAA4C061246 for ; Fri, 4 Sep 2020 08:21:29 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id e17so6434555wme.0 for ; Fri, 04 Sep 2020 08:21:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UTzOsHSC+gZF9PSWWpuSmxUozEdf7QQLb/WCmyturHc=; b=MfZkEE7Gfj0EtpOJBT7E7Tf2l0qG42PZBryzfeuryiCZ74FGcKYrek3oeHE6kk7niZ d95jS1ajKAMD3cSEE3LnGLsKhc/+uB2M3h/3qc8fJx82Vc9qJf7rtt5ICZ/EpHdIyJ/p gobCsWFnQc2hRa7E+c90WvWV62/pGlk09hWK1IIPvZus1bT4XkoLrx7mL/9hHlA/qzhj qTkQxQQ4mIsiqIOH3waewQkRPI+GEs/8kcwYCMSdi/5Az7ISYmcKvymWygDvTvrgoGYW cuG+NX1fx9ZTnVdkkZkw20h0bv4odID5CMSRzGhs1+niyMAZ0/TjBWzjxOFYIT0S1rTb r0yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UTzOsHSC+gZF9PSWWpuSmxUozEdf7QQLb/WCmyturHc=; b=egRMXMTwMWuyo2CQHEZ46DasaCuJ1nTJlWurrwghQBVYVjtAk4Wt4zVLWmP+R9wWS4 fC2LJzgj75Zq722YQfA839I7MKzD91XvdaqWtOpMT/uoKN0MgjcTFLNI9quoVHf/5RQ+ oJ9FuWVC08Ep63v9PhqohMlsbF3JZQwGbKfMeYl9fWelbwmUqIhyoBZmDCpeZ2kegIXY FJ6GwQttM1YAhC/PoKWSyYd7kFtgvQv1+6AVrdMKRL5kpBJDhqG807cg2BuZKGa8MNo7 MmJhi2Hx8t0sPGrkNXW+tfiuFluR2xzfLK5yo+SQgWTGEvNbxVB9wWxTupA2Q9Eds3Pi q3Tg== X-Gm-Message-State: AOAM530pCi6fbQQV9boDHmpNJFGSn2swdCeN/SGjVinfBrCW+eD77xr0 73urE3w64cwfawgvuXt3uiU+yw== X-Google-Smtp-Source: ABdhPJz85fPQMFzckhhoTot2QaK8gl2HFrn/KMmGkiQzh+8CaGPlQpEFpsbRrgx1VteJY1b1GXeTvA== X-Received: by 2002:a1c:e108:: with SMTP id y8mr5770367wmg.179.1599232888476; Fri, 04 Sep 2020 08:21:28 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:28 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 6/8] rtc: rx8010: drop unnecessary initialization Date: Fri, 4 Sep 2020 17:21:14 +0200 Message-Id: <20200904152116.2157-7-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski The 'err' local variable in rx8010_init_client() doesn't need to be initialized. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index f3bed7be2533..181fc21cefa8 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -196,7 +196,7 @@ static int rx8010_init_client(struct i2c_client *client) { struct rx8010_data *rx8010 = i2c_get_clientdata(client); u8 ctrl[2]; - int need_clear = 0, err = 0; + int need_clear = 0, err; /* Initialize reserved registers as specified in datasheet */ err = i2c_smbus_write_byte_data(client, RX8010_RESV17, 0xD8); From patchwork Fri Sep 4 15:21:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357603 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=yGxJWlsy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhHG6blpz9sTg for ; Sat, 5 Sep 2020 01:22:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730811AbgIDPWA (ORCPT ); Fri, 4 Sep 2020 11:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730810AbgIDPVl (ORCPT ); Fri, 4 Sep 2020 11:21:41 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B651FC061260 for ; Fri, 4 Sep 2020 08:21:30 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id x14so7090311wrl.12 for ; Fri, 04 Sep 2020 08:21:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eEZDuStJjJk1FIrMzwflNMl97fxslfVlQl/5yuaVYNI=; b=yGxJWlsyeosFf351pC1itNstGCRhwWhmdMXb4VQRFTAu/Qyrsb0OIp5seNKsnrOelE zqxYV7mkcv8JyXa/zPwFYsZBbngqzyjOH0OoO0ktkwcBwMbJ27fFg7CSEclPLeEzciJ5 3aJTlA99yXS4EviRJd4r8inMZVlJOjPUwTiZrP0gQwpgO5EEFbdQNUW6LGUZf1J5n47S GUyCiKqxf/u++rcyDtNJnNMc9X46SGlUe/S5YJrDA2x8L3mRyI7isBAIcXYQBYJJZ+my gXjX5FS9uP75Uad8hyGEf0cZyeVrOAKIE/jAz3iT6ac0AkBL53NwAaQt27f6F4qUckeM QCvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eEZDuStJjJk1FIrMzwflNMl97fxslfVlQl/5yuaVYNI=; b=lEw2bUddD5DDGMG0LZh61cmajb+NwhbSs7N/su6QmHuZLv6J+43Jit0VHh/R9VCCv4 4/m+Kf3nVQE+gup945upy8fTgvxGPLz3/i+FWPjymJIQOdyorMSmuFLhMjp0iQjOxZnp QfO/dS40vao0xNvAhFpiv2M2NsCxZT9dRzBns7Picbjm7EcY1mUsaTRj1kSdqaQDwsfQ 1XDXoQSbYxJ+jscnYwLAnmJaujM79aKi3VVOlcTA6eq/kFBwlJdGcHpmEiSajcc/SXec jN5cmu1em/+3FWlyxdUdBG74SmVm5ddJFGSI5Jc1m4Ltxi+oGu4d9t6oBgnZVWiInBWp SBRw== X-Gm-Message-State: AOAM533G2lmyFQRYLyw+Kxs6haFWxfUBwvPbgj3r03ykPW1UTEpU99E+ PipmiSnA0D7uEJms4ZYLt1vtFg== X-Google-Smtp-Source: ABdhPJwl4h3PqASTyFA1+ncRsFs+j+n3e5ZfX4N1EuqV6KZX9K8bXEhi628kvRJBKe6oBcnZRI/lDw== X-Received: by 2002:adf:f8d0:: with SMTP id f16mr8793626wrq.66.1599232889418; Fri, 04 Sep 2020 08:21:29 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:28 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 7/8] rtc: rx8010: fix indentation in probe() Date: Fri, 4 Sep 2020 17:21:15 +0200 Message-Id: <20200904152116.2157-8-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski Align the arguments passed to devm_rtc_device_register() with the upper line. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index 181fc21cefa8..ed8ba38b4991 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -450,7 +450,7 @@ static int rx8010_probe(struct i2c_client *client, } rx8010->rtc = devm_rtc_device_register(&client->dev, client->name, - &rx8010_rtc_ops, THIS_MODULE); + &rx8010_rtc_ops, THIS_MODULE); if (IS_ERR(rx8010->rtc)) { dev_err(&client->dev, "unable to register the class device\n"); From patchwork Fri Sep 4 15:21:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1357602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=fPCUrboK; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BjhHG1njLz9sVB for ; Sat, 5 Sep 2020 01:22:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730249AbgIDPWA (ORCPT ); Fri, 4 Sep 2020 11:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730811AbgIDPVl (ORCPT ); Fri, 4 Sep 2020 11:21:41 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6517C061261 for ; Fri, 4 Sep 2020 08:21:31 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id c15so7090226wrs.11 for ; Fri, 04 Sep 2020 08:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vPuAh6dJLqF1MMOld+Vh9OgjOaso2bSPsSVbEIu7nNo=; b=fPCUrboKEGGH9px7AQRok+/55UEK/cBKkvoxbsBZkt2QR7vI7zMz1L1eyxsbIwTnfG 3hMCkQpF/7rgnNnO2EeESJJAu2Yo3NHgZCfPvd17ckd3qcqeeUwlIynzWwxcwicvO7Uw IphAD1wD2mXKYjGBjfZOiLBguKAjS+Kq9AmT1oJZ/TrCDfwMFfYctNRdpy6XiNBCinEv OUt4XQOv6dhAqRG7FNlgl3CwJavuBq9zzhEvhc2Ad7Dx6yKQu7k1wMgz80dqZi9D/mGB 7KmA3iZJganePUR/4n2LN8ZIU1iiilReGhQ6ANxca43zAL5tm8iWDqnNMYVeD/pnLcxM zp3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vPuAh6dJLqF1MMOld+Vh9OgjOaso2bSPsSVbEIu7nNo=; b=ojpVmYzN8N9fCeVlu4yDdr4bRW1ncYJ+IITMxky1AqJRNA1alm2fEnYsm7prxv2/Er RLQ4kDvgCOiJLGxqTmCn0DBNJ27bTvl3pbzjpAY2CghUq6oz30o5u+Du5r2kWMf/8lL9 1aYTFLLoobOkR+RtJjLTLI5U6jUyM0APFowtmve/RJOyGnPCmS5c9jMMZU29MTPDXeVk ok2mQg4ZrbFw5KY6Buwn7ggyK3rGIWv1rXZMIPlwjIYWUXkgknYit++eO6nv1ZJkCy5O kM/MHVOlSrRJQdKBsaKWU4Ua8p8tZDV2hfwXTuAVCJCWE65YmtqOfGZN3azwi9ivXCA4 WbNw== X-Gm-Message-State: AOAM530RI7U3I1ih0WxBtXiy3w+eYSRJVyfv2u2eh6mhY/R9u6R96ZN2 vtv4V4GqwiScOaiI8CKMJMPBZw== X-Google-Smtp-Source: ABdhPJylbxwVNZoOLgi9l+TsuVv/bki3CN77paA6Hm5UOKliZ5/+6rPf9qHcIGvzR6rZFHzCUveeiA== X-Received: by 2002:a5d:5261:: with SMTP id l1mr8083893wrc.193.1599232890437; Fri, 04 Sep 2020 08:21:30 -0700 (PDT) Received: from debian-brgl.home (lfbn-nic-1-68-20.w2-15.abo.wanadoo.fr. [2.15.159.20]) by smtp.gmail.com with ESMTPSA id a11sm7789534wmm.18.2020.09.04.08.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 08:21:29 -0700 (PDT) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 8/8] rtc: rx8010: convert to using regmap Date: Fri, 4 Sep 2020 17:21:16 +0200 Message-Id: <20200904152116.2157-9-brgl@bgdev.pl> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200904152116.2157-1-brgl@bgdev.pl> References: <20200904152116.2157-1-brgl@bgdev.pl> MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski This driver requires SMBUS to work. We can relax this requirement if we switch to using i2c regmap and let the regmap sub-system figure out how to talk to the bus. This also has the advantage of shrinking the code for register updates. Signed-off-by: Bartosz Golaszewski --- drivers/rtc/rtc-rx8010.c | 200 ++++++++++++++++----------------------- 1 file changed, 81 insertions(+), 119 deletions(-) diff --git a/drivers/rtc/rtc-rx8010.c b/drivers/rtc/rtc-rx8010.c index ed8ba38b4991..9be3ea88e86d 100644 --- a/drivers/rtc/rtc-rx8010.c +++ b/drivers/rtc/rtc-rx8010.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #define RX8010_SEC 0x10 @@ -63,7 +64,7 @@ static const struct of_device_id rx8010_of_match[] = { MODULE_DEVICE_TABLE(of, rx8010_of_match); struct rx8010_data { - struct i2c_client *client; + struct regmap *regs; struct rtc_device *rtc; u8 ctrlreg; }; @@ -72,13 +73,12 @@ static irqreturn_t rx8010_irq_1_handler(int irq, void *dev_id) { struct i2c_client *client = dev_id; struct rx8010_data *rx8010 = i2c_get_clientdata(client); - int flagreg; + int flagreg, err; mutex_lock(&rx8010->rtc->ops_lock); - flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG); - - if (flagreg <= 0) { + err = regmap_read(rx8010->regs, RX8010_FLAG, &flagreg); + if (err) { mutex_unlock(&rx8010->rtc->ops_lock); return IRQ_NONE; } @@ -101,10 +101,9 @@ static irqreturn_t rx8010_irq_1_handler(int irq, void *dev_id) rtc_update_irq(rx8010->rtc, 1, RTC_UF | RTC_IRQF); } - i2c_smbus_write_byte_data(client, RX8010_FLAG, flagreg); - + err = regmap_write(rx8010->regs, RX8010_FLAG, flagreg); mutex_unlock(&rx8010->rtc->ops_lock); - return IRQ_HANDLED; + return err ? IRQ_NONE : IRQ_HANDLED; } static int rx8010_get_time(struct device *dev, struct rtc_time *dt) @@ -113,19 +112,19 @@ static int rx8010_get_time(struct device *dev, struct rtc_time *dt) u8 date[RX8010_TIME_BUF_LEN]; int flagreg, err; - flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); - if (flagreg < 0) - return flagreg; + err = regmap_read(rx8010->regs, RX8010_FLAG, &flagreg); + if (err) + return err; if (flagreg & RX8010_FLAG_VLF) { dev_warn(dev, "Frequency stop detected\n"); return -EINVAL; } - err = i2c_smbus_read_i2c_block_data(rx8010->client, RX8010_SEC, - RX8010_TIME_BUF_LEN, date); - if (err != RX8010_TIME_BUF_LEN) - return err < 0 ? err : -EIO; + err = regmap_bulk_read(rx8010->regs, RX8010_SEC, + date, RX8010_TIME_BUF_LEN); + if (err) + return err; dt->tm_sec = bcd2bin(date[RX8010_SEC - RX8010_SEC] & 0x7f); dt->tm_min = bcd2bin(date[RX8010_MIN - RX8010_SEC] & 0x7f); @@ -142,19 +141,14 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); u8 date[RX8010_TIME_BUF_LEN]; - int ctrl, flagreg, err; + int err; if ((dt->tm_year < 100) || (dt->tm_year > 199)) return -EINVAL; /* set STOP bit before changing clock/calendar */ - ctrl = i2c_smbus_read_byte_data(rx8010->client, RX8010_CTRL); - if (ctrl < 0) - return ctrl; - rx8010->ctrlreg = ctrl | RX8010_CTRL_STOP; - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, - rx8010->ctrlreg); - if (err < 0) + err = regmap_set_bits(rx8010->regs, RX8010_CTRL, RX8010_CTRL_STOP); + if (err) return err; date[RX8010_SEC - RX8010_SEC] = bin2bcd(dt->tm_sec); @@ -165,66 +159,55 @@ static int rx8010_set_time(struct device *dev, struct rtc_time *dt) date[RX8010_YEAR - RX8010_SEC] = bin2bcd(dt->tm_year - 100); date[RX8010_WDAY - RX8010_SEC] = bin2bcd(1 << dt->tm_wday); - err = i2c_smbus_write_i2c_block_data(rx8010->client, - RX8010_SEC, RX8010_TIME_BUF_LEN, - date); - if (err < 0) + err = regmap_bulk_write(rx8010->regs, RX8010_SEC, + date, RX8010_TIME_BUF_LEN); + if (err) return err; /* clear STOP bit after changing clock/calendar */ - ctrl = i2c_smbus_read_byte_data(rx8010->client, RX8010_CTRL); - if (ctrl < 0) - return ctrl; - rx8010->ctrlreg = ctrl & ~RX8010_CTRL_STOP; - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, - rx8010->ctrlreg); - if (err < 0) + err = regmap_clear_bits(rx8010->regs, RX8010_CTRL, RX8010_CTRL_STOP); + if (err) return err; - flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); - if (flagreg < 0) - return flagreg; - - if (flagreg & RX8010_FLAG_VLF) - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG, - flagreg & ~RX8010_FLAG_VLF); + err = regmap_clear_bits(rx8010->regs, RX8010_FLAG, RX8010_FLAG_VLF); + if (err) + return err; return 0; } -static int rx8010_init_client(struct i2c_client *client) +static int rx8010_init_client(struct device *dev) { - struct rx8010_data *rx8010 = i2c_get_clientdata(client); + struct rx8010_data *rx8010 = dev_get_drvdata(dev); u8 ctrl[2]; int need_clear = 0, err; /* Initialize reserved registers as specified in datasheet */ - err = i2c_smbus_write_byte_data(client, RX8010_RESV17, 0xD8); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_RESV17, 0xD8); + if (err) return err; - err = i2c_smbus_write_byte_data(client, RX8010_RESV30, 0x00); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_RESV30, 0x00); + if (err) return err; - err = i2c_smbus_write_byte_data(client, RX8010_RESV31, 0x08); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_RESV31, 0x08); + if (err) return err; - err = i2c_smbus_write_byte_data(client, RX8010_IRQ, 0x00); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_IRQ, 0x00); + if (err) return err; - err = i2c_smbus_read_i2c_block_data(rx8010->client, RX8010_FLAG, - 2, ctrl); - if (err != 2) - return err < 0 ? err : -EIO; + err = regmap_bulk_read(rx8010->regs, RX8010_FLAG, ctrl, 2); + if (err) + return err; if (ctrl[0] & RX8010_FLAG_VLF) - dev_warn(&client->dev, "Frequency stop was detected\n"); + dev_warn(dev, "Frequency stop was detected\n"); if (ctrl[0] & RX8010_FLAG_AF) { - dev_warn(&client->dev, "Alarm was detected\n"); + dev_warn(dev, "Alarm was detected\n"); need_clear = 1; } @@ -236,8 +219,8 @@ static int rx8010_init_client(struct i2c_client *client) if (need_clear) { ctrl[0] &= ~(RX8010_FLAG_AF | RX8010_FLAG_TF | RX8010_FLAG_UF); - err = i2c_smbus_write_byte_data(client, RX8010_FLAG, ctrl[0]); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_FLAG, ctrl[0]); + if (err) return err; } @@ -249,17 +232,16 @@ static int rx8010_init_client(struct i2c_client *client) static int rx8010_read_alarm(struct device *dev, struct rtc_wkalrm *t) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); - struct i2c_client *client = rx8010->client; u8 alarmvals[3]; int flagreg, err; - err = i2c_smbus_read_i2c_block_data(client, RX8010_ALMIN, 3, alarmvals); - if (err != 3) - return err < 0 ? err : -EIO; + err = regmap_bulk_read(rx8010->regs, RX8010_ALMIN, alarmvals, 3); + if (err) + return err; - flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG); - if (flagreg < 0) - return flagreg; + err = regmap_read(rx8010->regs, RX8010_FLAG, &flagreg); + if (err) + return err; t->time.tm_sec = 0; t->time.tm_min = bcd2bin(alarmvals[0] & 0x7f); @@ -276,52 +258,38 @@ static int rx8010_read_alarm(struct device *dev, struct rtc_wkalrm *t) static int rx8010_set_alarm(struct device *dev, struct rtc_wkalrm *t) { - struct i2c_client *client = to_i2c_client(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev); u8 alarmvals[3]; - int extreg, flagreg, err; - - flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG); - if (flagreg < 0) - return flagreg; + int err; if (rx8010->ctrlreg & (RX8010_CTRL_AIE | RX8010_CTRL_UIE)) { rx8010->ctrlreg &= ~(RX8010_CTRL_AIE | RX8010_CTRL_UIE); - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, - rx8010->ctrlreg); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_CTRL, rx8010->ctrlreg); + if (err) return err; } - flagreg &= ~RX8010_FLAG_AF; - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG, flagreg); - if (err < 0) + err = regmap_clear_bits(rx8010->regs, RX8010_FLAG, RX8010_FLAG_AF); + if (err) return err; alarmvals[0] = bin2bcd(t->time.tm_min); alarmvals[1] = bin2bcd(t->time.tm_hour); alarmvals[2] = bin2bcd(t->time.tm_mday); - err = i2c_smbus_write_i2c_block_data(rx8010->client, RX8010_ALMIN, - 2, alarmvals); - if (err < 0) + err = regmap_bulk_write(rx8010->regs, RX8010_ALMIN, alarmvals, 2); + if (err) return err; - extreg = i2c_smbus_read_byte_data(client, RX8010_EXT); - if (extreg < 0) - return extreg; - - extreg |= RX8010_EXT_WADA; - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_EXT, extreg); - if (err < 0) + err = regmap_clear_bits(rx8010->regs, RX8010_EXT, RX8010_EXT_WADA); + if (err) return err; if (alarmvals[2] == 0) alarmvals[2] |= RX8010_ALARM_AE; - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_ALWDAY, - alarmvals[2]); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_ALWDAY, alarmvals[2]); + if (err) return err; if (t->enabled) { @@ -331,9 +299,8 @@ static int rx8010_set_alarm(struct device *dev, struct rtc_wkalrm *t) rx8010->ctrlreg |= (RX8010_CTRL_AIE | RX8010_CTRL_UIE); - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, - rx8010->ctrlreg); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_CTRL, rx8010->ctrlreg); + if (err) return err; } @@ -343,9 +310,8 @@ static int rx8010_set_alarm(struct device *dev, struct rtc_wkalrm *t) static int rx8010_alarm_irq_enable(struct device *dev, unsigned int enabled) { - struct i2c_client *client = to_i2c_client(dev); struct rx8010_data *rx8010 = dev_get_drvdata(dev); - int flagreg, err; + int err; u8 ctrl; ctrl = rx8010->ctrlreg; @@ -362,20 +328,14 @@ static int rx8010_alarm_irq_enable(struct device *dev, ctrl &= ~RX8010_CTRL_AIE; } - flagreg = i2c_smbus_read_byte_data(client, RX8010_FLAG); - if (flagreg < 0) - return flagreg; - - flagreg &= ~RX8010_FLAG_AF; - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_FLAG, flagreg); - if (err < 0) + err = regmap_clear_bits(rx8010->regs, RX8010_FLAG, RX8010_FLAG_AF); + if (err) return err; if (ctrl != rx8010->ctrlreg) { rx8010->ctrlreg = ctrl; - err = i2c_smbus_write_byte_data(rx8010->client, RX8010_CTRL, - rx8010->ctrlreg); - if (err < 0) + err = regmap_write(rx8010->regs, RX8010_CTRL, rx8010->ctrlreg); + if (err) return err; } @@ -385,13 +345,13 @@ static int rx8010_alarm_irq_enable(struct device *dev, static int rx8010_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) { struct rx8010_data *rx8010 = dev_get_drvdata(dev); - int tmp, flagreg; + int tmp, flagreg, err; switch (cmd) { case RTC_VL_READ: - flagreg = i2c_smbus_read_byte_data(rx8010->client, RX8010_FLAG); - if (flagreg < 0) - return flagreg; + err = regmap_read(rx8010->regs, RX8010_FLAG, &flagreg); + if (err) + return err; tmp = flagreg & RX8010_FLAG_VLF ? RTC_VL_DATA_INVALID : 0; return put_user(tmp, (unsigned int __user *)arg); @@ -407,28 +367,30 @@ static struct rtc_class_ops rx8010_rtc_ops = { .ioctl = rx8010_ioctl, }; +static const struct regmap_config rx8010_regmap_config = { + .name = "rx8010-rtc", + .reg_bits = 8, + .val_bits = 8, +}; + static int rx8010_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct i2c_adapter *adapter = client->adapter; struct rx8010_data *rx8010; int err = 0; - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA - | I2C_FUNC_SMBUS_I2C_BLOCK)) { - dev_err(&adapter->dev, "doesn't support required functionality\n"); - return -EIO; - } - rx8010 = devm_kzalloc(&client->dev, sizeof(struct rx8010_data), GFP_KERNEL); if (!rx8010) return -ENOMEM; - rx8010->client = client; i2c_set_clientdata(client, rx8010); - err = rx8010_init_client(client); + rx8010->regs = devm_regmap_init_i2c(client, &rx8010_regmap_config); + if (IS_ERR(rx8010->regs)) + return PTR_ERR(rx8010->regs); + + err = rx8010_init_client(&client->dev); if (err) return err;