Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[deliverable/linux.git] / drivers / rtc / rtc-ds1685.c

diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index 05a51ef52703271dc195ec4fad27a498adcb5578..535050fc5e9fd2fd20b60b7dc88a437afaa29bd8 100644 (file)
--- 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)
           "Periodic Rate\t: %s\n"
           "SQW Freq\t: %s\n"
 #ifdef CONFIG_RTC_DS1685_PROC_REGS
-          "Serial #\t: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n"
+          "Serial #\t: %8phC\n"
           "Register Status\t:\n"
           "   Ctrl A\t: UIP  DV2  DV1  DV0  RS3  RS2  RS1  RS0\n"
           "\t\t:  %s\n"
@@ -872,7 +872,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq)
           "   Ctrl 4B\t: ABE  E32k  CS  RCE  PRS  RIE  WIE  KSE\n"
           "\t\t:  %s\n",
 #else
-          "Serial #\t: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
+          "Serial #\t: %8phC\n",
 #endif
           model,
           ((ctrla & RTC_CTRL_A_DV1) ? "enabled" : "disabled"),
@@ -888,7 +888,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq)
           (!((ctrl4b & RTC_CTRL_4B_E32K)) ?
            ds1685_rtc_sqw_freq[(ctrla & RTC_CTRL_A_RS_MASK)] : "32768Hz"),
 #ifdef CONFIG_RTC_DS1685_PROC_REGS
-          ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5], ssn[6], ssn[7],
+          ssn,
           ds1685_rtc_print_regs(ctrla, bits[0]),
           ds1685_rtc_print_regs(ctrlb, bits[1]),
           ds1685_rtc_print_regs(ctrlc, bits[2]),
@@ -896,7 +896,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq)
           ds1685_rtc_print_regs(ctrl4a, bits[4]),
           ds1685_rtc_print_regs(ctrl4b, bits[5]));
 #else
-          ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5], ssn[6], ssn[7]);
+          ssn);
 #endif
        return 0;
 }
@@ -1114,7 +1114,7 @@ ds1685_rtc_sysfs_battery_show(struct device *dev,
 
        ctrld = rtc->read(rtc, RTC_CTRL_D);
 
-       return snprintf(buf, 13, "%s\n",
+       return sprintf(buf, "%s\n",
                        (ctrld & RTC_CTRL_D_VRT) ? "ok" : "not ok or N/A");
 }
 static DEVICE_ATTR(battery, S_IRUGO, ds1685_rtc_sysfs_battery_show, NULL);
@@ -1137,7 +1137,7 @@ ds1685_rtc_sysfs_auxbatt_show(struct device *dev,
        ctrl4a = rtc->read(rtc, RTC_EXT_CTRL_4A);
        ds1685_rtc_switch_to_bank0(rtc);
 
-       return snprintf(buf, 13, "%s\n",
+       return sprintf(buf, "%s\n",
                        (ctrl4a & RTC_CTRL_4A_VRT2) ? "ok" : "not ok or N/A");
 }
 static DEVICE_ATTR(auxbatt, S_IRUGO, ds1685_rtc_sysfs_auxbatt_show, NULL);
@@ -1160,11 +1160,7 @@ ds1685_rtc_sysfs_serial_show(struct device *dev,
        ds1685_rtc_get_ssn(rtc, ssn);
        ds1685_rtc_switch_to_bank0(rtc);
 
-       return snprintf(buf, 24, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
-                       ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5],
-                       ssn[6], ssn[7]);
-
-       return 0;
+       return sprintf(buf, "%8phC\n", ssn);
 }
 static DEVICE_ATTR(serial, S_IRUGO, ds1685_rtc_sysfs_serial_show, NULL);
 
@@ -1287,7 +1283,7 @@ ds1685_rtc_sysfs_ctrl_regs_show(struct device *dev,
        tmp = rtc->read(rtc, reg_info->reg) & reg_info->bit;
        ds1685_rtc_switch_to_bank0(rtc);
 
-       return snprintf(buf, 2, "%d\n", (tmp ? 1 : 0));
+       return sprintf(buf, "%d\n", (tmp ? 1 : 0));
 }
 
 /**
@@ -1623,7 +1619,7 @@ ds1685_rtc_sysfs_time_regs_show(struct device *dev,
        tmp = ds1685_rtc_bcd2bin(rtc, tmp, bcd_reg_info->mask,
                                 bin_reg_info->mask);
 
-       return snprintf(buf, 4, "%d\n", tmp);
+       return sprintf(buf, "%d\n", tmp);
 }
 
 /**