Patchwork rtc: ds3232: remove unneeded check

login
register
mail settings
Submitter Dan Carpenter
Date Oct. 28, 2010, 2:07 p.m.
Message ID <20101028140713.GF6062@bicker>
Download mbox | patch
Permalink /patch/69465/
State New
Headers show

Comments

Dan Carpenter - Oct. 28, 2010, 2:07 p.m.
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 <error27@gmail.com>
Zang Roy-R61911 - Oct. 29, 2010, 2:28 a.m.
> -----Original Message-----
> From: Dan Carpenter [mailto:error27@gmail.com]
> 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 <error27@gmail.com>
> 
> diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
> index 5706355..7767b4f 100644
> --- a/drivers/rtc/rtc-ds3232.c
> +++ b/drivers/rtc/rtc-ds3232.c
> @@ -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];


Acked-by: Roy Zang <tie-fei.zang@freescale.com>

Thanks.
Roy

Patch

diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
index 5706355..7767b4f 100644
--- a/drivers/rtc/rtc-ds3232.c
+++ b/drivers/rtc/rtc-ds3232.c
@@ -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)