LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] seq_file conversion: APM on arm
@ 2007-01-15 20:59 Alexey Dobriyan
  2007-01-24  0:45 ` Andrew Morton
  0 siblings, 1 reply; 12+ messages in thread
From: Alexey Dobriyan @ 2007-01-15 20:59 UTC (permalink / raw)
  To: akpm; +Cc: linux-kernel, rmk

Compile-tested.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 arch/arm/kernel/apm.c |   28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

--- a/arch/arm/kernel/apm.c
+++ b/arch/arm/kernel/apm.c
@@ -14,6 +14,7 @@ #include <linux/module.h>
 #include <linux/poll.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/miscdevice.h>
 #include <linux/apm_bios.h>
 #include <linux/capability.h>
@@ -501,11 +502,10 @@ #ifdef CONFIG_PROC_FS
  *	-1: Unknown
  *   8) min = minutes; sec = seconds
  */
-static int apm_get_info(char *buf, char **start, off_t fpos, int length)
+static int proc_apm_show(struct seq_file *m, void *v)
 {
 	struct apm_power_info info;
 	char *units;
-	int ret;
 
 	info.ac_line_status = 0xff;
 	info.battery_status = 0xff;
@@ -523,14 +523,26 @@ static int apm_get_info(char *buf, char 
 	case 1: 	units = "sec";	break;
 	}
 
-	ret = sprintf(buf, "%s 1.2 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",
+	seq_printf(m, "%s 1.2 0x%02x 0x%02x 0x%02x 0x%02x %d%% %d %s\n",
 		     driver_version, APM_32_BIT_SUPPORT,
 		     info.ac_line_status, info.battery_status,
 		     info.battery_flag, info.battery_life,
 		     info.time, units);
+	return 0;
+}
 
- 	return ret;
+static int proc_apm_open(struct inode *inode, struct file *file)
+{
+	return single_open(file, proc_apm_show, NULL);
 }
+
+static const struct file_operations proc_apm_fops = {
+	.owner		= THIS_MODULE,
+	.open		= proc_apm_open,
+	.read		= seq_read,
+	.llseek		= seq_lseek,
+	.release	= single_release,
+};
 #endif
 
 static int kapmd(void *arg)
@@ -602,7 +614,13 @@ static int __init apm_init(void)
 	wake_up_process(kapmd_tsk);
 
 #ifdef CONFIG_PROC_FS
-	create_proc_info_entry("apm", 0, NULL, apm_get_info);
+	{
+		struct proc_dir_entry *pde;
+
+		pde = create_proc_entry("apm", 0, NULL);
+		if (pde)
+			pde->proc_fops = &proc_apm_fops;
+	}
 #endif
 
 	ret = misc_register(&apm_device);


^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2007-01-26 13:06 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-01-15 20:59 [PATCH] seq_file conversion: APM on arm Alexey Dobriyan
2007-01-24  0:45 ` Andrew Morton
2007-01-24  1:52   ` Ralf Baechle
2007-01-24  7:13   ` Paul Mundt
2007-01-24 12:37     ` Ralf Baechle
2007-01-24 12:44     ` [PATCH 1/3] Add shared version of APM emulation Ralf Baechle
2007-01-24 12:45       ` [PATCH 2/3] ARM: Convert to use shared " Ralf Baechle
2007-01-24 17:50         ` Pavel Machek
2007-01-26 13:04           ` Ralf Baechle
2007-01-26 13:06             ` Ralf Baechle
2007-01-24 12:46       ` [PATCH 3/3] MIPS: " Ralf Baechle
2007-01-24 12:56       ` [PATCH] sh: " Paul Mundt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).