Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adfb4341 authored by Alessandro Zummo's avatar Alessandro Zummo Committed by Linus Torvalds
Browse files

[PATCH] RTC subsystem: fix proc output 



Move the "24hr: yes" proc output from drivers to rtc proc code.  This is
required because the time value in the proc output is always in 24hr mode
regardless of the driver.

Signed-off-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Cc: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f90a6506

drivers/rtc/rtc-ep93xx.c

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ static int ep93xx_rtc_proc(struct device *dev, struct seq_file *seq) 


	ep93xx_get_swcomp(dev, &preload, &delete);



	seq_printf(seq, "24hr\t\t: yes\n");

	seq_printf(seq, "preload\t\t: %d\n", preload);

	seq_printf(seq, "delete\t\t: %d\n", delete);

drivers/rtc/rtc-m48t86.c

+0 −3
Original line number Diff line number Diff line
@@ -127,9 +127,6 @@ static int m48t86_rtc_proc(struct device *dev, struct seq_file *seq) 


	reg = ops->readb(M48T86_REG_B);



	seq_printf(seq, "24hr\t\t: %s\n",

		 (reg & M48T86_REG_B_H24) ? "yes" : "no");



	seq_printf(seq, "mode\t\t: %s\n",

		 (reg & M48T86_REG_B_DM) ? "binary" : "bcd");

drivers/rtc/rtc-pcf8563.c

+0 −7
Original line number Diff line number Diff line
@@ -227,14 +227,7 @@ static int pcf8563_rtc_set_time(struct device *dev, struct rtc_time *tm) 
	return pcf8563_set_datetime(to_i2c_client(dev), tm);

}



static int pcf8563_rtc_proc(struct device *dev, struct seq_file *seq)

{

	seq_printf(seq, "24hr\t\t: yes\n");

	return 0;

}



static struct rtc_class_ops pcf8563_rtc_ops = {

	.proc		= pcf8563_rtc_proc,

	.read_time	= pcf8563_rtc_read_time,

	.set_time	= pcf8563_rtc_set_time,

};

drivers/rtc/rtc-proc.c

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ static int rtc_proc_show(struct seq_file *seq, void *offset) 
				alrm.pending ? "yes" : "no");

	}



	seq_printf(seq, "24hr\t\t: yes\n");



	if (ops->proc)

		ops->proc(class_dev->dev, seq);

drivers/rtc/rtc-rs5c372.c

+2 −3
Original line number Diff line number Diff line
@@ -151,9 +151,8 @@ static int rs5c372_rtc_proc(struct device *dev, struct seq_file *seq) 
{

	int err, osc, trim;



	seq_printf(seq, "24hr\t\t: yes\n");



	if ((err = rs5c372_get_trim(to_i2c_client(dev), &osc, &trim)) == 0) {

	err = rs5c372_get_trim(to_i2c_client(dev), &osc, &trim);

	if (err == 0) {

		seq_printf(seq, "%d.%03d KHz\n", osc / 1000, osc % 1000);

		seq_printf(seq, "trim\t: %d\n", trim);

	}