diff options
Diffstat (limited to 'drivers/rtc/rtc-ds1685.c')
-rw-r--r-- | drivers/rtc/rtc-ds1685.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c index 05a51ef52703..5038122aa8de 100644 --- a/drivers/rtc/rtc-ds1685.c +++ b/drivers/rtc/rtc-ds1685.c | |||
@@ -853,7 +853,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) | |||
853 | "Periodic Rate\t: %s\n" | 853 | "Periodic Rate\t: %s\n" |
854 | "SQW Freq\t: %s\n" | 854 | "SQW Freq\t: %s\n" |
855 | #ifdef CONFIG_RTC_DS1685_PROC_REGS | 855 | #ifdef CONFIG_RTC_DS1685_PROC_REGS |
856 | "Serial #\t: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n" | 856 | "Serial #\t: %8phC\n" |
857 | "Register Status\t:\n" | 857 | "Register Status\t:\n" |
858 | " Ctrl A\t: UIP DV2 DV1 DV0 RS3 RS2 RS1 RS0\n" | 858 | " Ctrl A\t: UIP DV2 DV1 DV0 RS3 RS2 RS1 RS0\n" |
859 | "\t\t: %s\n" | 859 | "\t\t: %s\n" |
@@ -872,7 +872,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) | |||
872 | " Ctrl 4B\t: ABE E32k CS RCE PRS RIE WIE KSE\n" | 872 | " Ctrl 4B\t: ABE E32k CS RCE PRS RIE WIE KSE\n" |
873 | "\t\t: %s\n", | 873 | "\t\t: %s\n", |
874 | #else | 874 | #else |
875 | "Serial #\t: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", | 875 | "Serial #\t: %8phC\n", |
876 | #endif | 876 | #endif |
877 | model, | 877 | model, |
878 | ((ctrla & RTC_CTRL_A_DV1) ? "enabled" : "disabled"), | 878 | ((ctrla & RTC_CTRL_A_DV1) ? "enabled" : "disabled"), |
@@ -888,7 +888,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) | |||
888 | (!((ctrl4b & RTC_CTRL_4B_E32K)) ? | 888 | (!((ctrl4b & RTC_CTRL_4B_E32K)) ? |
889 | ds1685_rtc_sqw_freq[(ctrla & RTC_CTRL_A_RS_MASK)] : "32768Hz"), | 889 | ds1685_rtc_sqw_freq[(ctrla & RTC_CTRL_A_RS_MASK)] : "32768Hz"), |
890 | #ifdef CONFIG_RTC_DS1685_PROC_REGS | 890 | #ifdef CONFIG_RTC_DS1685_PROC_REGS |
891 | ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5], ssn[6], ssn[7], | 891 | ssn, |
892 | ds1685_rtc_print_regs(ctrla, bits[0]), | 892 | ds1685_rtc_print_regs(ctrla, bits[0]), |
893 | ds1685_rtc_print_regs(ctrlb, bits[1]), | 893 | ds1685_rtc_print_regs(ctrlb, bits[1]), |
894 | ds1685_rtc_print_regs(ctrlc, bits[2]), | 894 | ds1685_rtc_print_regs(ctrlc, bits[2]), |
@@ -896,7 +896,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) | |||
896 | ds1685_rtc_print_regs(ctrl4a, bits[4]), | 896 | ds1685_rtc_print_regs(ctrl4a, bits[4]), |
897 | ds1685_rtc_print_regs(ctrl4b, bits[5])); | 897 | ds1685_rtc_print_regs(ctrl4b, bits[5])); |
898 | #else | 898 | #else |
899 | ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5], ssn[6], ssn[7]); | 899 | ssn); |
900 | #endif | 900 | #endif |
901 | return 0; | 901 | return 0; |
902 | } | 902 | } |
@@ -1160,9 +1160,7 @@ ds1685_rtc_sysfs_serial_show(struct device *dev, | |||
1160 | ds1685_rtc_get_ssn(rtc, ssn); | 1160 | ds1685_rtc_get_ssn(rtc, ssn); |
1161 | ds1685_rtc_switch_to_bank0(rtc); | 1161 | ds1685_rtc_switch_to_bank0(rtc); |
1162 | 1162 | ||
1163 | return snprintf(buf, 24, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", | 1163 | return snprintf(buf, 24, "%8phC\n", ssn); |
1164 | ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5], | ||
1165 | ssn[6], ssn[7]); | ||
1166 | 1164 | ||
1167 | return 0; | 1165 | return 0; |
1168 | } | 1166 | } |