History

rtc: ds1685: remove superfluous checks for out-of-range u8 values

drivers/rtc/rtc-ds1685.c: In function `ds1685_rtc_read_alarm': drivers/rtc/rtc-ds1685.c:402: warning: comparison is always true due to limited range of data type drivers/rtc/rtc-ds1685.c:409: warning: comparison is always true due to limited range of data type drivers/rtc/rtc-ds1685.c:416: warning: comparison is always true due to limited range of data type drivers/rtc/rtc-ds1685.c: In function `ds1685_rtc_set_alarm': drivers/rtc/rtc-ds1685.c:475: warning: comparison is always true due to limited range of data type drivers/rtc/rtc-ds1685.c:478: warning: comparison is always true due to limited range of data type drivers/rtc/rtc-ds1685.c:481: warning: comparison is always true due to limited range of data type u8 cannot contain a value larger than 0xff, hence drop the checks. Wrapping the checks in unlikely() indicated some sense of humor, though ;-)

Geert Uytterhoeven committed 11 years ago

Commit 39ea34c1 parent 682354d1 file · +6 −6Browse files

Unified · Split

drivers/rtc/rtc-ds1685.c+6−6
@@ -399,21 +399,21 @@ ds1685_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) · 398 unmodified lines
399 * of this RTC chip. We check for it anyways in case support is399 * of this RTC chip. We check for it anyways in case support is
400 * added in the future.400 * added in the future.
401 */401 */
402 if (unlikely((seconds >= 0xc0) && (seconds <= 0xff)))402 if (unlikely(seconds >= 0xc0))
403 alrm->time.tm_sec = -1;403 alrm->time.tm_sec = -1;
404 else404 else
405 alrm->time.tm_sec = ds1685_rtc_bcd2bin(rtc, seconds,405 alrm->time.tm_sec = ds1685_rtc_bcd2bin(rtc, seconds,
406 RTC_SECS_BCD_MASK,406 RTC_SECS_BCD_MASK,
407 RTC_SECS_BIN_MASK);407 RTC_SECS_BIN_MASK);
408 408
409 if (unlikely((minutes >= 0xc0) && (minutes <= 0xff)))409 if (unlikely(minutes >= 0xc0))
410 alrm->time.tm_min = -1;410 alrm->time.tm_min = -1;
411 else411 else
412 alrm->time.tm_min = ds1685_rtc_bcd2bin(rtc, minutes,412 alrm->time.tm_min = ds1685_rtc_bcd2bin(rtc, minutes,
413 RTC_MINS_BCD_MASK,413 RTC_MINS_BCD_MASK,
414 RTC_MINS_BIN_MASK);414 RTC_MINS_BIN_MASK);
415 415
416 if (unlikely((hours >= 0xc0) && (hours <= 0xff)))416 if (unlikely(hours >= 0xc0))
417 alrm->time.tm_hour = -1;417 alrm->time.tm_hour = -1;
418 else418 else
419 alrm->time.tm_hour = ds1685_rtc_bcd2bin(rtc, hours,419 alrm->time.tm_hour = ds1685_rtc_bcd2bin(rtc, hours,
@@ -472,13 +472,13 @@ ds1685_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) · 52 unmodified lines
472 * field, and we only support four fields. We put the support472 * field, and we only support four fields. We put the support
473 * here anyways for the future.473 * here anyways for the future.
474 */474 */
475 if (unlikely((seconds >= 0xc0) && (seconds <= 0xff)))475 if (unlikely(seconds >= 0xc0))
476 seconds = 0xff;476 seconds = 0xff;
477 477
478 if (unlikely((minutes >= 0xc0) && (minutes <= 0xff)))478 if (unlikely(minutes >= 0xc0))
479 minutes = 0xff;479 minutes = 0xff;
480 480
481 if (unlikely((hours >= 0xc0) && (hours <= 0xff)))481 if (unlikely(hours >= 0xc0))
482 hours = 0xff;482 hours = 0xff;
483 483
484 alrm->time.tm_mon = -1;484 alrm->time.tm_mon = -1;