From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: rtc-linux@googlegroups.com
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
linux-kernel@vger.kernel.org, cphealy@gmail.com
Subject: [PATCH v2 12/17] RTC: ds1307: Redefine RX8025_REG_* to minimize extra code
Date: Tue, 21 Jun 2016 00:22:45 -0700 [thread overview]
Message-ID: <1466493770-11895-11-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1466493770-11895-1-git-send-email-andrew.smirnov@gmail.com>
The only place in the driver where RX8025_REG_* are used they are always
shifted and ORed the same way, so instead of repeating that idiom make
it a part of symbolic constant.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/rtc/rtc-ds1307.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index cbbe9f0..2af9c00 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -103,9 +103,11 @@ enum ds_type {
#define DS13XX_TRICKLE_CHARGER_MAGIC 0xa0
-#define RX8025_REG_CTRL1 0x0e
+#define RX8025_REG_CTRL1_ 0x0e
+#define RX8025_REG_CTRL1 ((RX8025_REG_CTRL1_ << 4) | 0x08)
# define RX8025_BIT_2412 0x20
-#define RX8025_REG_CTRL2 0x0f
+#define RX8025_REG_CTRL2_ 0x0f
+#define RX8025_REG_CTRL2 ((RX8025_REG_CTRL2_ << 4) | 0x08)
# define RX8025_BIT_PON 0x10
# define RX8025_BIT_VDET 0x40
# define RX8025_BIT_XST 0x20
@@ -1353,7 +1355,7 @@ static int ds1307_chip_configure(const struct ds1307 *ds1307)
}
case rx_8025:
tmp = i2c_smbus_read_i2c_block_data(client,
- RX8025_REG_CTRL1 << 4 | 0x08,
+ RX8025_REG_CTRL1,
2, regs);
if (tmp != 2) {
dev_dbg(&client->dev, "read error %d\n", tmp);
@@ -1364,7 +1366,7 @@ static int ds1307_chip_configure(const struct ds1307 *ds1307)
if (!(regs[1] & RX8025_BIT_XST)) {
regs[1] |= RX8025_BIT_XST;
i2c_smbus_write_byte_data(client,
- RX8025_REG_CTRL2 << 4 | 0x08,
+ RX8025_REG_CTRL2,
regs[1]);
dev_warn(&client->dev,
"oscillator stop detected - SET TIME!\n");
@@ -1373,7 +1375,7 @@ static int ds1307_chip_configure(const struct ds1307 *ds1307)
if (regs[1] & RX8025_BIT_PON) {
regs[1] &= ~RX8025_BIT_PON;
i2c_smbus_write_byte_data(client,
- RX8025_REG_CTRL2 << 4 | 0x08,
+ RX8025_REG_CTRL2,
regs[1]);
dev_warn(&client->dev, "power-on detected\n");
}
@@ -1381,7 +1383,7 @@ static int ds1307_chip_configure(const struct ds1307 *ds1307)
if (regs[1] & RX8025_BIT_VDET) {
regs[1] &= ~RX8025_BIT_VDET;
i2c_smbus_write_byte_data(client,
- RX8025_REG_CTRL2 << 4 | 0x08,
+ RX8025_REG_CTRL2,
regs[1]);
dev_warn(&client->dev, "voltage drop detected\n");
}
@@ -1392,11 +1394,11 @@ static int ds1307_chip_configure(const struct ds1307 *ds1307)
/* switch to 24 hour mode */
i2c_smbus_write_byte_data(client,
- RX8025_REG_CTRL1 << 4 | 0x08,
+ RX8025_REG_CTRL1,
regs[0] | RX8025_BIT_2412);
tmp = i2c_smbus_read_i2c_block_data(client,
- RX8025_REG_CTRL1 << 4 | 0x08,
+ RX8025_REG_CTRL1,
2, regs);
if (tmp != 2) {
dev_dbg(&client->dev, "read error %d\n", tmp);
--
2.5.5
next prev parent reply other threads:[~2016-06-21 7:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 7:22 [PATCH v2 02/17] RTC: ds1307: Disable square wave and timers as default Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 03/17] RTC: ds1307: Add devicetree bindings for DS1341 Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 04/17] RTC: ds1307: Add DS1341 specific power-saving options Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 05/17] RTC: ds1307: Convert ds1307_can_wakeup_device into a predicate Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 06/17] RTC: ds1307: Convert want_irq " Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 07/17] RTC: ds1307: Move chip configuration into a separate routine Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 08/17] RTC: ds1307: Move chip sanity checking " Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 09/17] RTC: ds1307: Remove register "cache" Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 10/17] RTC: ds1307: Constify struct ds1307 where possible Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 11/17] RTC: ds1307: Convert goto to a loop Andrey Smirnov
2016-06-21 7:22 ` Andrey Smirnov [this message]
2016-06-21 7:22 ` [PATCH v2 13/17] RTC: ds1307: Report oscillator problems more intelligently Andrey Smirnov
2016-06-21 21:22 ` Alexandre Belloni
2016-06-21 23:06 ` Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 14/17] RTC: ds1307: Move last bits of sanity checking out of chip_configure Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 15/17] RTC: rtctest: Change alarm IRQ support detection Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 16/17] RTC: rtctest: Change no IRQ detection for RTC_IRQP_READ Andrey Smirnov
2016-06-21 7:22 ` [PATCH v2 17/17] RTC: rtctest: Change no IRQ detection for RTC_IRQP_SET Andrey Smirnov
2016-06-21 21:17 ` [PATCH v2 02/17] RTC: ds1307: Disable square wave and timers as default Alexandre Belloni
2016-06-21 23:43 ` Andrey Smirnov
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=1466493770-11895-11-git-send-email-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=cphealy@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rtc-linux@googlegroups.com \
/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;
as well as URLs for NNTP newsgroup(s).