Skip to contentSkip to conversation

rtc: ds3232: remove unneeded check

PATCH In review Dan Carpenter 2 participants 2 messages Oct 28, 2010 – Oct 29, 2010

Subsystems (2)
Kernel janitors Real time clock (RTC)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 rtc: ds3232: remove unneeded check

bcd2bin() returns unsigned values so they're never less than zero. I asked Jack Lan and he said I could just remove that part of the check.

Signed-off-by Dan Carpenter <[email protected]>
drivers/rtc/rtc-ds3232.c +4 -8
index 5706355..7767b4f 100644
@@ -289,14 +289,10 @@ static void ds3232_update_alarm(struct i2c_client *client)
 	if (ret < 0)
 		goto unlock;
 
-	buf[0] = bcd2bin(buf[0]) < 0 || (ds3232->rtc->irq_data & RTC_UF) ?
-								0x80 : buf[0];
-	buf[1] = bcd2bin(buf[1]) < 0 || (ds3232->rtc->irq_data & RTC_UF) ?
-								0x80 : buf[1];
-	buf[2] = bcd2bin(buf[2]) < 0 || (ds3232->rtc->irq_data & RTC_UF) ?
-								0x80 : buf[2];
-	buf[3] = bcd2bin(buf[3]) < 0 || (ds3232->rtc->irq_data & RTC_UF) ?
-								0x80 : buf[3];
+	buf[0] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[0];
+	buf[1] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[1];
+	buf[2] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[2];
+	buf[3] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[3];
 
 	ret = i2c_smbus_write_i2c_block_data(client, DS3232_REG_ALARM1, 4, buf);
 	if (ret < 0)
Acked-by Roy Zang on v1 1/1
#1 lore raw

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct

Quoted 13 lines

-----Original Message-----
From: Dan Carpenter [mailto:[email protected]]
bcd2bin() returns unsigned values so they're never less than zero. I asked Jack Lan and he said I could just remove that part of the check.

Signed-off-by Dan Carpenter <[email protected]>
drivers/rtc/rtc-ds3232.c +0 -0
index 5706355..7767b4f 100644
@@ -289,14 +289,10 @@ static void ds3232_update_alarm(struct

i2c_client

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct i2c_client *client)

Quoted 5 lines
drivers/rtc/rtc-ds3232.c +0 -1
 *client)
 	if (ret < 0)
 		goto unlock;
 
-	buf[0] = bcd2bin(buf[0]) < 0 || (ds3232->rtc->irq_data & RTC_UF)

?

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct · line 294

Quoted 1 line
drivers/rtc/rtc-ds3232.c +0 -1
-								0x80 :

buf[0];

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct · line 295

Quoted 1 line
drivers/rtc/rtc-ds3232.c +0 -1
-	buf[1] = bcd2bin(buf[1]) < 0 || (ds3232->rtc->irq_data & RTC_UF)

?

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct · line 296

Quoted 1 line
drivers/rtc/rtc-ds3232.c +0 -1
-								0x80 :

buf[1];

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct · line 297

Quoted 1 line
drivers/rtc/rtc-ds3232.c +0 -1
-	buf[2] = bcd2bin(buf[2]) < 0 || (ds3232->rtc->irq_data & RTC_UF)

?

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct · line 298

Quoted 1 line
drivers/rtc/rtc-ds3232.c +0 -1
-								0x80 :

buf[2];

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct · line 299

Quoted 1 line
drivers/rtc/rtc-ds3232.c +0 -1
-	buf[3] = bcd2bin(buf[3]) < 0 || (ds3232->rtc->irq_data & RTC_UF)

?

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct · line 300

Quoted 1 line
drivers/rtc/rtc-ds3232.c +0 -1
-								0x80 :

buf[3];

drivers/rtc/rtc-ds3232.c static void ds3232_update_alarm(struct i2c_client *client) · line 295

Quoted 4 lines
drivers/rtc/rtc-ds3232.c +4 -0
+	buf[0] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[0];
+	buf[1] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[1];
+	buf[2] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[2];
+	buf[3] = (ds3232->rtc->irq_data & RTC_UF) ? 0x80 : buf[3];
Acked-by Roy Zang <[email protected]>

Thanks.
Roy