From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932981AbcFUHZy (ORCPT ); Tue, 21 Jun 2016 03:25:54 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35574 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754293AbcFUHYY (ORCPT ); Tue, 21 Jun 2016 03:24:24 -0400 From: Andrey Smirnov To: rtc-linux@googlegroups.com Cc: Andrey Smirnov , Alessandro Zummo , Alexandre Belloni , 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 Message-Id: <1466493770-11895-11-git-send-email-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466493770-11895-1-git-send-email-andrew.smirnov@gmail.com> References: <1466493770-11895-1-git-send-email-andrew.smirnov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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