lkml.org 
[lkml]   [2012]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] rtc/rtc-spear: remove unnecessary check against rtc_valid_tm and tm2bcd
Date
rtc_valid_tm is always return
-EINVAL if the time doesn't represent a valid date and time and 0 if its.

so we can simply do rtc_valid_tm(tm) rather doing rtc_valid_tm(tm) != 0 checking.
and also tm2bcd() does return -EINVAL if the time doesn't represent a valid date and time
and 0 if its.

and also removing err because is_write_complete will return -EIO if our write to the
RTC registers didn't happen and 0 if its.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
---

This is only tested by compiling the code with arm-linux-gcc

/bin/arm-linux-gnueabihf-gcc --version

arm-linux-gnueabihf-gcc (crosstool-NG linaro-1.13.1-2012.05-20120523 - Linaro GCC 2012.05) 4.7.1 20120514 (prerelease)

drivers/rtc/rtc-spear.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/rtc/rtc-spear.c b/drivers/rtc/rtc-spear.c
index e278547..eb7d399 100644
--- a/drivers/rtc/rtc-spear.c
+++ b/drivers/rtc/rtc-spear.c
@@ -172,7 +172,7 @@ static irqreturn_t spear_rtc_irq(int irq, void *dev_id)

static int tm2bcd(struct rtc_time *tm)
{
- if (rtc_valid_tm(tm) != 0)
+ if (rtc_valid_tm(tm))
return -EINVAL;
tm->tm_sec = bin2bcd(tm->tm_sec);
tm->tm_min = bin2bcd(tm->tm_min);
@@ -235,9 +235,9 @@ static int spear_rtc_read_time(struct device *dev, struct rtc_time *tm)
static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
{
struct spear_rtc_config *config = dev_get_drvdata(dev);
- unsigned int time, date, err = 0;
+ unsigned int time, date;

- if (tm2bcd(tm) < 0)
+ if (tm2bcd(tm))
return -EINVAL;

rtc_wait_not_busy(config);
@@ -247,11 +247,8 @@ static int spear_rtc_set_time(struct device *dev, struct rtc_time *tm)
(tm->tm_year << YEAR_SHIFT);
writel(time, config->ioaddr + TIME_REG);
writel(date, config->ioaddr + DATE_REG);
- err = is_write_complete(config);
- if (err < 0)
- return err;

- return 0;
+ return is_write_complete(config);
}

/*
@@ -297,7 +294,7 @@ static int spear_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alm)
struct spear_rtc_config *config = dev_get_drvdata(dev);
unsigned int time, date, err = 0;

- if (tm2bcd(&alm->time) < 0)
+ if (tm2bcd(&alm->time))
return -EINVAL;

rtc_wait_not_busy(config);
--
1.7.9.5


\
 
 \ /
  Last update: 2012-06-23 14:21    [W:0.046 / U:3.524 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site