genirq: switch /proc/irq/*/spurious to seq_file
PATCH 1/1 genirq: switch /proc/irq/*/spurious to seq_file
---
kernel/irq/proc.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-)
kernel/irq/proc.c +18 -10
@@ -148,18 +148,30 @@ static const struct file_operations default_affinity_proc_fops = { };#endif -static int irq_spurious_read (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int irq_spurious_proc_show (struct seq_file *m,void *v) { -struct irq_desc *desc =irq_to_desc ((long ) data); -return sprintf (page,"count %u\n" +struct irq_desc *desc =irq_to_desc ((long ) m->private); +seq_printf (m,"count %u\n" "unhandled %u\n" "last_unhandled %u ms\n" , desc->irq_count, desc->irqs_unhandled,jiffies_to_msecs (desc->last_unhandled)); +return 0 ; } +static int irq_spurious_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, irq_spurious_proc_show,NULL ); +} + +static const struct file_operations irq_spurious_proc_fops = { + .open = irq_spurious_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +#define MAX_NAMELEN 128static int name_unique (unsigned int irq,struct irqaction *new_action)
@@ -204,7 +216,6 @@ void register_handler_proc(unsigned int irq, struct irqaction *action)void register_irq_proc (unsigned int irq,struct irq_desc *desc) {char name [MAX_NAMELEN ]; -struct proc_dir_entry *entry;if (!root_irq_dir || (desc->chip == &no_irq_chip) || desc->dir)return ;
@@ -221,11 +232,8 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc) &irq_affinity_proc_fops, (void *)(long)irq);#endif - entry =create_proc_entry ("spurious" ,0444 , desc->dir); -if (entry) { - entry->data = (void *)(long )irq; - entry->read_proc = irq_spurious_read; - } +proc_create_data ("spurious" ,0444 , desc->dir, + &irq_spurious_proc_fops, (void *)(long )irq); }#undef MAX_NAMELEN
Commit-ID: a1afb6371bb5341057056194d1168753f6d77242 Gitweb: http://git.kernel.org/tip/a1afb6371bb5341057056194d1168753f6d77242 Author: Alexey Dobriyan <[email protected]> AuthorDate: Fri, 28 Aug 2009 22:19:33 +0400 Committer: Thomas Gleixner <[email protected]> CommitDate: Wed, 18 Nov 2009 12:50:51 +0100
genirq: switch /proc/irq/*/spurious to seq_file
[ tglx: compacted it a bit ]
LKML-Reference: <[email protected]>
--- kernel/irq/proc.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-)
kernel/irq/proc.c +21 -15
@@ -148,18 +148,28 @@ static const struct file_operations default_affinity_proc_fops = { };#endif -static int irq_spurious_read (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int irq_spurious_proc_show (struct seq_file *m,void *v) { -struct irq_desc *desc =irq_to_desc ((long ) data); -return sprintf (page,"count %u\n" -"unhandled %u\n" -"last_unhandled %u ms\n" , - desc->irq_count, - desc->irqs_unhandled, -jiffies_to_msecs (desc->last_unhandled)); +struct irq_desc *desc =irq_to_desc ((long ) m->private); + +seq_printf (m,"count %u\n" "unhandled %u\n" "last_unhandled %u ms\n" , + desc->irq_count, desc->irqs_unhandled, +jiffies_to_msecs (desc->last_unhandled)); +return 0 ; +} + +static int irq_spurious_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, irq_spurious_proc_show,NULL ); } +static const struct file_operations irq_spurious_proc_fops = { + .open = irq_spurious_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +#define MAX_NAMELEN 128static int name_unique (unsigned int irq,struct irqaction *new_action)
@@ -204,7 +214,6 @@ void register_handler_proc(unsigned int irq, struct irqaction *action)void register_irq_proc (unsigned int irq,struct irq_desc *desc) {char name [MAX_NAMELEN ]; -struct proc_dir_entry *entry;if (!root_irq_dir || (desc->chip == &no_irq_chip) || desc->dir)return ;
@@ -223,11 +232,8 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc) &irq_affinity_proc_fops, (void *)(long)irq);#endif - entry =create_proc_entry ("spurious" ,0444 , desc->dir); -if (entry) { - entry->data = (void *)(long )irq; - entry->read_proc = irq_spurious_read; - } +proc_create_data ("spurious" ,0444 , desc->dir, + &irq_spurious_proc_fops, (void *)(long )irq); }#undef MAX_NAMELEN
Quoted 8 lines · tip-bot for Alexey Dobriyan
kernel/irq/proc.c +0
-2@@ -148,18 +148,28 @@ static const struct file_operations default_affinity_proc_fops = { };#endif -static int irq_spurious_read (char *page,char **start,off_t off, -int count,int *eof,void *data)
kernel/irq/proc.c static const struct file_operations default_affinity_proc_fops = { · line 153
Quoted 10 lines
kernel/irq/proc.c +2
-7+static int irq_spurious_proc_show (struct seq_file *m,void *v) { -struct irq_desc *desc =irq_to_desc ((long ) data); -return sprintf (page,"count %u\n" -"unhandled %u\n" -"last_unhandled %u ms\n" , - desc->irq_count, - desc->irqs_unhandled, -jiffies_to_msecs (desc->last_unhandled)); +struct irq_desc *desc =irq_to_desc ((long ) m->private);
^^^^^^^^^^
kernel/irq/proc.c static const struct file_operations default_affinity_proc_fops = { · line 163
Quoted 10 lines
kernel/irq/proc.c +10
-0+ +seq_printf (m,"count %u\n" "unhandled %u\n" "last_unhandled %u ms\n" , + desc->irq_count, desc->irqs_unhandled, +jiffies_to_msecs (desc->last_unhandled)); +return 0 ; +} + +static int irq_spurious_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, irq_spurious_proc_show,NULL );
Oops, there has to be PDE(inode)->data instead of NULL.
Quoted 20 lines · Alexey Dobriyan
Quoted 8 lines · tip-bot for Alexey Dobriyan
kernel/irq/proc.c +0
-2@@ -148,18 +148,28 @@ static const struct file_operations default_affinity_proc_fops = { };#endif -static int irq_spurious_read (char *page,char **start,off_t off, -int count,int *eof,void *data)kernel/irq/proc.c static const struct file_operations default_affinity_proc_fops = { · line 153
Quoted 10 lines
kernel/irq/proc.c +2
-7+static int irq_spurious_proc_show (struct seq_file *m,void *v) { -struct irq_desc *desc =irq_to_desc ((long ) data); -return sprintf (page,"count %u\n" -"unhandled %u\n" -"last_unhandled %u ms\n" , - desc->irq_count, - desc->irqs_unhandled, -jiffies_to_msecs (desc->last_unhandled)); +struct irq_desc *desc =irq_to_desc ((long ) m->private);^^^^^^^^^^
Quoted 12 lines
kernel/irq/proc.c static const struct file_operations default_affinity_proc_fops = { · line 163
Quoted 10 lines
kernel/irq/proc.c +10
-0+ +seq_printf (m,"count %u\n" "unhandled %u\n" "last_unhandled %u ms\n" , + desc->irq_count, desc->irqs_unhandled, +jiffies_to_msecs (desc->last_unhandled)); +return 0 ; +} + +static int irq_spurious_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, irq_spurious_proc_show,NULL );Oops, there has to be PDE(inode)->data instead of NULL.
Send a patch please.
Thanks,
Ingo
Quoted 36 lines · Ingo Molnar
Quoted 20 lines · Alexey Dobriyan
Quoted 8 lines · tip-bot for Alexey Dobriyan
kernel/irq/proc.c +0
-2@@ -148,18 +148,28 @@ static const struct file_operations default_affinity_proc_fops = { };#endif -static int irq_spurious_read (char *page,char **start,off_t off, -int count,int *eof,void *data)kernel/irq/proc.c static const struct file_operations default_affinity_proc_fops = { · line 153
Quoted 10 lines
kernel/irq/proc.c +2
-7+static int irq_spurious_proc_show (struct seq_file *m,void *v) { -struct irq_desc *desc =irq_to_desc ((long ) data); -return sprintf (page,"count %u\n" -"unhandled %u\n" -"last_unhandled %u ms\n" , - desc->irq_count, - desc->irqs_unhandled, -jiffies_to_msecs (desc->last_unhandled)); +struct irq_desc *desc =irq_to_desc ((long ) m->private);^^^^^^^^^^Quoted 12 lines
kernel/irq/proc.c static const struct file_operations default_affinity_proc_fops = { · line 163
Quoted 10 lines
kernel/irq/proc.c +10
-0+ +seq_printf (m,"count %u\n" "unhandled %u\n" "last_unhandled %u ms\n" , + desc->irq_count, desc->irqs_unhandled, +jiffies_to_msecs (desc->last_unhandled)); +return 0 ; +} + +static int irq_spurious_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, irq_spurious_proc_show,NULL );Oops, there has to be PDE(inode)->data instead of NULL.
Quoted 3 lines
Send a patch please.
Thanks,
Never mind - Thomas queued up the fix meanwhile.
Thanks,
Ingo