From: Randy Dunlap <rdunlap@infradead.org>
To: unlisted-recipients:; (no To-header on input)
Cc: Randy Dunlap <rdunlap@infradead.org>,
kernel test robot <lkp@intel.com>,
Russell King <rmk+kernel@armlinux.org.uk>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
linux-rtc@vger.kernel.org
Subject: [PATCH] rtc: pcf8523: rename REG_OFFSET register
Date: Sun, 6 Jun 2021 09:24:23 -0700 [thread overview]
Message-ID: <20210606162423.22235-1-rdunlap@infradead.org> (raw)
REG_OFFSET is defined both here and in arch/arm/mach-ixp4xx/, which
causes a build warning, so rename this macro in the RTC driver.
../drivers/rtc/rtc-pcf8523.c:44: warning: "REG_OFFSET" redefined
44 | #define REG_OFFSET 0x0e
../arch/arm/mach-ixp4xx/include/mach/platform.h:25: note: this is the location of the previous definition
25 | #define REG_OFFSET 3
Fixes: bc3bee025272 ("rtc: pcf8523: add support for trimming the RTC oscillator")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-rtc@vger.kernel.org
---
drivers/rtc/rtc-pcf8523.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- linux-next-20210604.orig/drivers/rtc/rtc-pcf8523.c
+++ linux-next-20210604/drivers/rtc/rtc-pcf8523.c
@@ -41,7 +41,7 @@
#define REG_WEEKDAY_ALARM 0x0d
#define ALARM_DIS BIT(7)
-#define REG_OFFSET 0x0e
+#define REG_OFFSET_TUNE 0x0e /* offset register is used for tuning */
#define REG_OFFSET_MODE BIT(7)
#define REG_TMR_CLKOUT_CTRL 0x0f
@@ -442,7 +442,7 @@ static int pcf8523_rtc_read_offset(struc
u8 value;
s8 val;
- err = pcf8523_read(client, REG_OFFSET, &value);
+ err = pcf8523_read(client, REG_OFFSET_TUNE, &value);
if (err < 0)
return err;
@@ -467,7 +467,7 @@ static int pcf8523_rtc_set_offset(struct
else
value = (reg_m1 & 0x7f) | REG_OFFSET_MODE;
- return pcf8523_write(client, REG_OFFSET, value);
+ return pcf8523_write(client, REG_OFFSET_TUNE, value);
}
static const struct rtc_class_ops pcf8523_rtc_ops = {
next reply other threads:[~2021-06-06 16:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-06 16:24 Randy Dunlap [this message]
2021-06-08 1:29 ` [PATCH] rtc: pcf8523: rename REG_OFFSET register Nobuhiro Iwamatsu
2021-06-08 12:24 ` Alexandre Belloni
2021-06-08 17:07 ` Randy Dunlap
2021-06-08 22:36 ` Alexandre Belloni
2021-06-08 22:40 ` Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210606162423.22235-1-rdunlap@infradead.org \
--to=rdunlap@infradead.org \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=linux-rtc@vger.kernel.org \
--cc=lkp@intel.com \
--cc=rmk+kernel@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox