Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-tx4939.c

diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index cb7f94ede5165b96b4adbdb8b382af6f39d792a0..560d9a5e02253fe3ef5cf159c71d94198498b45c 100644 (file)
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -199,8 +199,7 @@ static ssize_t tx4939_rtc_nvram_read(struct file *filp, struct kobject *kobj,
        ssize_t count;
 
        spin_lock_irq(&pdata->lock);
-       for (count = 0; size > 0 && pos < TX4939_RTC_REG_RAMSIZE;
-            count++, size--) {
+       for (count = 0; count < size; count++) {
                __raw_writel(pos++, &rtcreg->adr);
                *buf++ = __raw_readl(&rtcreg->dat);
        }
@@ -218,8 +217,7 @@ static ssize_t tx4939_rtc_nvram_write(struct file *filp, struct kobject *kobj,
        ssize_t count;
 
        spin_lock_irq(&pdata->lock);
-       for (count = 0; size > 0 && pos < TX4939_RTC_REG_RAMSIZE;
-            count++, size--) {
+       for (count = 0; count < size; count++) {
                __raw_writel(pos++, &rtcreg->adr);
                __raw_writel(*buf++, &rtcreg->dat);
        }