diff options
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-ep93xx.c | 1 | ||||
-rw-r--r-- | drivers/rtc/rtc-m48t86.c | 3 | ||||
-rw-r--r-- | drivers/rtc/rtc-pcf8563.c | 7 | ||||
-rw-r--r-- | drivers/rtc/rtc-proc.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-rs5c372.c | 5 | ||||
-rw-r--r-- | drivers/rtc/rtc-test.c | 1 | ||||
-rw-r--r-- | drivers/rtc/rtc-x1205.c | 2 |
7 files changed, 4 insertions, 17 deletions
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c index 0dd80ea686a9..6d9fe2cca285 100644 --- a/drivers/rtc/rtc-ep93xx.c +++ b/drivers/rtc/rtc-ep93xx.c | |||
@@ -67,7 +67,6 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq) | |||
67 | 67 | ||
68 | ep93xx_get_swcomp(dev, &preload, &delete); | 68 | ep93xx_get_swcomp(dev, &preload, &delete); |
69 | 69 | ||
70 | seq_printf(seq, "24hr\t\t: yes\n"); | ||
71 | seq_printf(seq, "preload\t\t: %d\n", preload); | 70 | seq_printf(seq, "preload\t\t: %d\n", preload); |
72 | seq_printf(seq, "delete\t\t: %d\n", delete); | 71 | seq_printf(seq, "delete\t\t: %d\n", delete); |
73 | 72 | ||
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c index 1fadada42a47..911b27fc8488 100644 --- a/drivers/rtc/rtc-m48t86.c +++ b/drivers/rtc/rtc-m48t86.c | |||
@@ -127,9 +127,6 @@ static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq) | |||
127 | 127 | ||
128 | reg = ops->readb(M48T86_REG_B); | 128 | reg = ops->readb(M48T86_REG_B); |
129 | 129 | ||
130 | seq_printf(seq, "24hr\t\t: %s\n", | ||
131 | (reg & M48T86_REG_B_H24) ? "yes" : "no"); | ||
132 | |||
133 | seq_printf(seq, "mode\t\t: %s\n", | 130 | seq_printf(seq, "mode\t\t: %s\n", |
134 | (reg & M48T86_REG_B_DM) ? "binary" : "bcd"); | 131 | (reg & M48T86_REG_B_DM) ? "binary" : "bcd"); |
135 | 132 | ||
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c index 26feca7caf07..0a7fd0b4685a 100644 --- a/drivers/rtc/rtc-pcf8563.c +++ b/drivers/rtc/rtc-pcf8563.c | |||
@@ -227,14 +227,7 @@ static int pcf8563_rtc_set_time(struct device *dev, struct rtc_time *tm) | |||
227 | return pcf8563_set_datetime(to_i2c_client(dev), tm); | 227 | return pcf8563_set_datetime(to_i2c_client(dev), tm); |
228 | } | 228 | } |
229 | 229 | ||
230 | static int pcf8563_rtc_proc(struct device *dev, struct seq_file *seq) | ||
231 | { | ||
232 | seq_printf(seq, "24hr\t\t: yes\n"); | ||
233 | return 0; | ||
234 | } | ||
235 | |||
236 | static struct rtc_class_ops pcf8563_rtc_ops = { | 230 | static struct rtc_class_ops pcf8563_rtc_ops = { |
237 | .proc = pcf8563_rtc_proc, | ||
238 | .read_time = pcf8563_rtc_read_time, | 231 | .read_time = pcf8563_rtc_read_time, |
239 | .set_time = pcf8563_rtc_set_time, | 232 | .set_time = pcf8563_rtc_set_time, |
240 | }; | 233 | }; |
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c index 90b8a97a0919..cef5f5a3bbf9 100644 --- a/drivers/rtc/rtc-proc.c +++ b/drivers/rtc/rtc-proc.c | |||
@@ -71,6 +71,8 @@ static int rtc_proc_show(struct seq_file *seq, void *offset) | |||
71 | alrm.pending ? "yes" : "no"); | 71 | alrm.pending ? "yes" : "no"); |
72 | } | 72 | } |
73 | 73 | ||
74 | seq_printf(seq, "24hr\t\t: yes\n"); | ||
75 | |||
74 | if (ops->proc) | 76 | if (ops->proc) |
75 | ops->proc(class_dev->dev, seq); | 77 | ops->proc(class_dev->dev, seq); |
76 | 78 | ||
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index b0aeb96aa5c7..48aecb890272 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c | |||
@@ -151,9 +151,8 @@ static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq) | |||
151 | { | 151 | { |
152 | int err, osc, trim; | 152 | int err, osc, trim; |
153 | 153 | ||
154 | seq_printf(seq, "24hr\t\t: yes\n"); | 154 | err = rs5c372_get_trim(to_i2c_client(dev), &osc, &trim); |
155 | 155 | if (err == 0) { | |
156 | if ((err = rs5c372_get_trim(to_i2c_client(dev), &osc, &trim)) == 0) { | ||
157 | seq_printf(seq, "%d.%03d KHz\n", osc / 1000, osc % 1000); | 156 | seq_printf(seq, "%d.%03d KHz\n", osc / 1000, osc % 1000); |
158 | seq_printf(seq, "trim\t: %d\n", trim); | 157 | seq_printf(seq, "trim\t: %d\n", trim); |
159 | } | 158 | } |
diff --git a/drivers/rtc/rtc-test.c b/drivers/rtc/rtc-test.c index 43d107487820..1bfe212b64a7 100644 --- a/drivers/rtc/rtc-test.c +++ b/drivers/rtc/rtc-test.c | |||
@@ -49,7 +49,6 @@ static int test_rtc_proc(struct device *dev, struct seq_file *seq) | |||
49 | { | 49 | { |
50 | struct platform_device *plat_dev = to_platform_device(dev); | 50 | struct platform_device *plat_dev = to_platform_device(dev); |
51 | 51 | ||
52 | seq_printf(seq, "24hr\t\t: yes\n"); | ||
53 | seq_printf(seq, "test\t\t: yes\n"); | 52 | seq_printf(seq, "test\t\t: yes\n"); |
54 | seq_printf(seq, "id\t\t: %d\n", plat_dev->id); | 53 | seq_printf(seq, "id\t\t: %d\n", plat_dev->id); |
55 | 54 | ||
diff --git a/drivers/rtc/rtc-x1205.c b/drivers/rtc/rtc-x1205.c index cdf0eba993be..f3573ef7c3f5 100644 --- a/drivers/rtc/rtc-x1205.c +++ b/drivers/rtc/rtc-x1205.c | |||
@@ -451,8 +451,6 @@ static int x1205_rtc_proc(struct device *dev, struct seq_file *seq) | |||
451 | { | 451 | { |
452 | int err, dtrim, atrim; | 452 | int err, dtrim, atrim; |
453 | 453 | ||
454 | seq_printf(seq, "24hr\t\t: yes\n"); | ||
455 | |||
456 | if ((err = x1205_get_dtrim(to_i2c_client(dev), &dtrim)) == 0) | 454 | if ((err = x1205_get_dtrim(to_i2c_client(dev), &dtrim)) == 0) |
457 | seq_printf(seq, "digital_trim\t: %d ppm\n", dtrim); | 455 | seq_printf(seq, "digital_trim\t: %d ppm\n", dtrim); |
458 | 456 | ||