diff options
Diffstat (limited to 'drivers/rtc/rtc-cmos.c')
| -rw-r--r-- | drivers/rtc/rtc-cmos.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index b6d35f50e404..23e10b6263d6 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
| @@ -797,17 +797,15 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) | |||
| 797 | goto cleanup2; | 797 | goto cleanup2; |
| 798 | } | 798 | } |
| 799 | 799 | ||
| 800 | pr_info("%s: alarms up to one %s%s, %zd bytes nvram%s\n", | 800 | pr_info("%s: %s%s, %zd bytes nvram%s\n", |
| 801 | dev_name(&cmos_rtc.rtc->dev), | 801 | dev_name(&cmos_rtc.rtc->dev), |
| 802 | is_valid_irq(rtc_irq) | 802 | !is_valid_irq(rtc_irq) ? "no alarms" : |
| 803 | ? (cmos_rtc.mon_alrm | 803 | cmos_rtc.mon_alrm ? "alarms up to one year" : |
| 804 | ? "year" | 804 | cmos_rtc.day_alrm ? "alarms up to one month" : |
| 805 | : (cmos_rtc.day_alrm | 805 | "alarms up to one day", |
| 806 | ? "month" : "day")) | 806 | cmos_rtc.century ? ", y3k" : "", |
| 807 | : "no", | 807 | nvram.size, |
| 808 | cmos_rtc.century ? ", y3k" : "", | 808 | is_hpet_enabled() ? ", hpet irqs" : ""); |
| 809 | nvram.size, | ||
| 810 | is_hpet_enabled() ? ", hpet irqs" : ""); | ||
| 811 | 809 | ||
| 812 | return 0; | 810 | return 0; |
| 813 | 811 | ||
