Commit ff67abd2 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Alexandre Belloni

rtc: use %ph for short hex dumps

This makes the generated code slightly smaller.
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 2ad2c174
...@@ -186,9 +186,7 @@ static int ds1305_get_time(struct device *dev, struct rtc_time *time) ...@@ -186,9 +186,7 @@ static int ds1305_get_time(struct device *dev, struct rtc_time *time)
if (status < 0) if (status < 0)
return status; return status;
dev_vdbg(dev, "%s: %02x %02x %02x, %02x %02x %02x %02x\n", dev_vdbg(dev, "%s: %3ph, %4ph\n", "read", &buf[0], &buf[3]);
"read", buf[0], buf[1], buf[2], buf[3],
buf[4], buf[5], buf[6]);
/* Decode the registers */ /* Decode the registers */
time->tm_sec = bcd2bin(buf[DS1305_SEC]); time->tm_sec = bcd2bin(buf[DS1305_SEC]);
...@@ -232,9 +230,7 @@ static int ds1305_set_time(struct device *dev, struct rtc_time *time) ...@@ -232,9 +230,7 @@ static int ds1305_set_time(struct device *dev, struct rtc_time *time)
*bp++ = bin2bcd(time->tm_mon + 1); *bp++ = bin2bcd(time->tm_mon + 1);
*bp++ = bin2bcd(time->tm_year - 100); *bp++ = bin2bcd(time->tm_year - 100);
dev_dbg(dev, "%s: %02x %02x %02x, %02x %02x %02x %02x\n", dev_dbg(dev, "%s: %3ph, %4ph\n", "write", &buf[1], &buf[4]);
"write", buf[1], buf[2], buf[3],
buf[4], buf[5], buf[6], buf[7]);
/* use write-then-read since dma from stack is nonportable */ /* use write-then-read since dma from stack is nonportable */
return spi_write_then_read(ds1305->spi, buf, sizeof(buf), return spi_write_then_read(ds1305->spi, buf, sizeof(buf),
......
...@@ -460,13 +460,8 @@ static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t) ...@@ -460,13 +460,8 @@ static int ds1337_read_alarm(struct device *dev, struct rtc_wkalrm *t)
return -EIO; return -EIO;
} }
dev_dbg(dev, "%s: %02x %02x %02x %02x, %02x %02x %02x, %02x %02x\n", dev_dbg(dev, "%s: %4ph, %3ph, %2ph\n", "alarm read",
"alarm read", &ds1307->regs[0], &ds1307->regs[4], &ds1307->regs[7]);
ds1307->regs[0], ds1307->regs[1],
ds1307->regs[2], ds1307->regs[3],
ds1307->regs[4], ds1307->regs[5],
ds1307->regs[6], ds1307->regs[7],
ds1307->regs[8]);
/* /*
* report alarm time (ALARM1); assume 24 hour and day-of-month modes, * report alarm time (ALARM1); assume 24 hour and day-of-month modes,
...@@ -522,12 +517,8 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t) ...@@ -522,12 +517,8 @@ static int ds1337_set_alarm(struct device *dev, struct rtc_wkalrm *t)
control = ds1307->regs[7]; control = ds1307->regs[7];
status = ds1307->regs[8]; status = ds1307->regs[8];
dev_dbg(dev, "%s: %02x %02x %02x %02x, %02x %02x %02x, %02x %02x\n", dev_dbg(dev, "%s: %4ph, %3ph, %02x %02x\n", "alarm set (old status)",
"alarm set (old status)", &ds1307->regs[0], &ds1307->regs[4], control, status);
ds1307->regs[0], ds1307->regs[1],
ds1307->regs[2], ds1307->regs[3],
ds1307->regs[4], ds1307->regs[5],
ds1307->regs[6], control, status);
/* set ALARM1, using 24 hour and day-of-month modes */ /* set ALARM1, using 24 hour and day-of-month modes */
buf[0] = bin2bcd(t->time.tm_sec); buf[0] = bin2bcd(t->time.tm_sec);
......
...@@ -853,7 +853,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) ...@@ -853,7 +853,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq)
"Periodic Rate\t: %s\n" "Periodic Rate\t: %s\n"
"SQW Freq\t: %s\n" "SQW Freq\t: %s\n"
#ifdef CONFIG_RTC_DS1685_PROC_REGS #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" "Register Status\t:\n"
" Ctrl A\t: UIP DV2 DV1 DV0 RS3 RS2 RS1 RS0\n" " Ctrl A\t: UIP DV2 DV1 DV0 RS3 RS2 RS1 RS0\n"
"\t\t: %s\n" "\t\t: %s\n"
...@@ -872,7 +872,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) ...@@ -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" " Ctrl 4B\t: ABE E32k CS RCE PRS RIE WIE KSE\n"
"\t\t: %s\n", "\t\t: %s\n",
#else #else
"Serial #\t: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", "Serial #\t: %8phC\n",
#endif #endif
model, model,
((ctrla & RTC_CTRL_A_DV1) ? "enabled" : "disabled"), ((ctrla & RTC_CTRL_A_DV1) ? "enabled" : "disabled"),
...@@ -888,7 +888,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) ...@@ -888,7 +888,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq)
(!((ctrl4b & RTC_CTRL_4B_E32K)) ? (!((ctrl4b & RTC_CTRL_4B_E32K)) ?
ds1685_rtc_sqw_freq[(ctrla & RTC_CTRL_A_RS_MASK)] : "32768Hz"), ds1685_rtc_sqw_freq[(ctrla & RTC_CTRL_A_RS_MASK)] : "32768Hz"),
#ifdef CONFIG_RTC_DS1685_PROC_REGS #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(ctrla, bits[0]),
ds1685_rtc_print_regs(ctrlb, bits[1]), ds1685_rtc_print_regs(ctrlb, bits[1]),
ds1685_rtc_print_regs(ctrlc, bits[2]), ds1685_rtc_print_regs(ctrlc, bits[2]),
...@@ -896,7 +896,7 @@ ds1685_rtc_proc(struct device *dev, struct seq_file *seq) ...@@ -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(ctrl4a, bits[4]),
ds1685_rtc_print_regs(ctrl4b, bits[5])); ds1685_rtc_print_regs(ctrl4b, bits[5]));
#else #else
ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5], ssn[6], ssn[7]); ssn);
#endif #endif
return 0; return 0;
} }
...@@ -1160,9 +1160,7 @@ ds1685_rtc_sysfs_serial_show(struct device *dev, ...@@ -1160,9 +1160,7 @@ ds1685_rtc_sysfs_serial_show(struct device *dev,
ds1685_rtc_get_ssn(rtc, ssn); ds1685_rtc_get_ssn(rtc, ssn);
ds1685_rtc_switch_to_bank0(rtc); ds1685_rtc_switch_to_bank0(rtc);
return snprintf(buf, 24, "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", return snprintf(buf, 24, "%8phC\n", ssn);
ssn[0], ssn[1], ssn[2], ssn[3], ssn[4], ssn[5],
ssn[6], ssn[7]);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment