mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 19:26:25 +00:00
proc: switch /proc/irda/irnet to seq_file interface
Probably interface misuse, because of the way iterating over hashbin is done.
However! Printing of socket number ("IrNET socket %d - ", i++") made conversion
to proper ->start/->next difficult enough to do blindly without hardware.
Said that, please apply.
Remove useless comment while I am it.
Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alexey Dobriyan
Linus Torvalds
parent
4bd61f76a5
commit
3ae02d6bc1
2 changed files with 34 additions and 39 deletions
|
|
@ -9,6 +9,7 @@
|
|||
*/
|
||||
|
||||
#include "irnet_irda.h" /* Private header */
|
||||
#include <linux/seq_file.h>
|
||||
|
||||
/*
|
||||
* PPP disconnect work: we need to make sure we're in
|
||||
|
|
@ -1717,34 +1718,23 @@ irnet_expiry_indication(discinfo_t * expiry,
|
|||
*/
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
/*------------------------------------------------------------------*/
|
||||
/*
|
||||
* Function irnet_proc_read (buf, start, offset, len, unused)
|
||||
*
|
||||
* Give some info to the /proc file system
|
||||
*/
|
||||
static int
|
||||
irnet_proc_read(char * buf,
|
||||
char ** start,
|
||||
off_t offset,
|
||||
int len)
|
||||
irnet_proc_show(struct seq_file *m, void *v)
|
||||
{
|
||||
irnet_socket * self;
|
||||
char * state;
|
||||
int i = 0;
|
||||
|
||||
len = 0;
|
||||
|
||||
/* Get the IrNET server information... */
|
||||
len += sprintf(buf+len, "IrNET server - ");
|
||||
len += sprintf(buf+len, "IrDA state: %s, ",
|
||||
seq_printf(m, "IrNET server - ");
|
||||
seq_printf(m, "IrDA state: %s, ",
|
||||
(irnet_server.running ? "running" : "dead"));
|
||||
len += sprintf(buf+len, "stsap_sel: %02x, ", irnet_server.s.stsap_sel);
|
||||
len += sprintf(buf+len, "dtsap_sel: %02x\n", irnet_server.s.dtsap_sel);
|
||||
seq_printf(m, "stsap_sel: %02x, ", irnet_server.s.stsap_sel);
|
||||
seq_printf(m, "dtsap_sel: %02x\n", irnet_server.s.dtsap_sel);
|
||||
|
||||
/* Do we need to continue ? */
|
||||
if(!irnet_server.running)
|
||||
return len;
|
||||
return 0;
|
||||
|
||||
/* Protect access to the instance list */
|
||||
spin_lock_bh(&irnet_server.spinlock);
|
||||
|
|
@ -1754,23 +1744,23 @@ irnet_proc_read(char * buf,
|
|||
while(self != NULL)
|
||||
{
|
||||
/* Start printing info about the socket. */
|
||||
len += sprintf(buf+len, "\nIrNET socket %d - ", i++);
|
||||
seq_printf(m, "\nIrNET socket %d - ", i++);
|
||||
|
||||
/* First, get the requested configuration */
|
||||
len += sprintf(buf+len, "Requested IrDA name: \"%s\", ", self->rname);
|
||||
len += sprintf(buf+len, "daddr: %08x, ", self->rdaddr);
|
||||
len += sprintf(buf+len, "saddr: %08x\n", self->rsaddr);
|
||||
seq_printf(m, "Requested IrDA name: \"%s\", ", self->rname);
|
||||
seq_printf(m, "daddr: %08x, ", self->rdaddr);
|
||||
seq_printf(m, "saddr: %08x\n", self->rsaddr);
|
||||
|
||||
/* Second, get all the PPP info */
|
||||
len += sprintf(buf+len, " PPP state: %s",
|
||||
seq_printf(m, " PPP state: %s",
|
||||
(self->ppp_open ? "registered" : "unregistered"));
|
||||
if(self->ppp_open)
|
||||
{
|
||||
len += sprintf(buf+len, ", unit: ppp%d",
|
||||
seq_printf(m, ", unit: ppp%d",
|
||||
ppp_unit_number(&self->chan));
|
||||
len += sprintf(buf+len, ", channel: %d",
|
||||
seq_printf(m, ", channel: %d",
|
||||
ppp_channel_index(&self->chan));
|
||||
len += sprintf(buf+len, ", mru: %d",
|
||||
seq_printf(m, ", mru: %d",
|
||||
self->mru);
|
||||
/* Maybe add self->flags ? Later... */
|
||||
}
|
||||
|
|
@ -1789,10 +1779,10 @@ irnet_proc_read(char * buf,
|
|||
state = "weird";
|
||||
else
|
||||
state = "idle";
|
||||
len += sprintf(buf+len, "\n IrDA state: %s, ", state);
|
||||
len += sprintf(buf+len, "daddr: %08x, ", self->daddr);
|
||||
len += sprintf(buf+len, "stsap_sel: %02x, ", self->stsap_sel);
|
||||
len += sprintf(buf+len, "dtsap_sel: %02x\n", self->dtsap_sel);
|
||||
seq_printf(m, "\n IrDA state: %s, ", state);
|
||||
seq_printf(m, "daddr: %08x, ", self->daddr);
|
||||
seq_printf(m, "stsap_sel: %02x, ", self->stsap_sel);
|
||||
seq_printf(m, "dtsap_sel: %02x\n", self->dtsap_sel);
|
||||
|
||||
/* Next socket, please... */
|
||||
self = (irnet_socket *) hashbin_get_next(irnet_server.list);
|
||||
|
|
@ -1801,8 +1791,21 @@ irnet_proc_read(char * buf,
|
|||
/* Spin lock end */
|
||||
spin_unlock_bh(&irnet_server.spinlock);
|
||||
|
||||
return len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int irnet_proc_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
return single_open(file, irnet_proc_show, NULL);
|
||||
}
|
||||
|
||||
static const struct file_operations irnet_proc_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = irnet_proc_open,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
#endif /* PROC_FS */
|
||||
|
||||
|
||||
|
|
@ -1841,7 +1844,7 @@ irda_irnet_init(void)
|
|||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
/* Add a /proc file for irnet infos */
|
||||
create_proc_info_entry("irnet", 0, proc_irda, irnet_proc_read);
|
||||
proc_create("irnet", 0, proc_irda, &irnet_proc_fops);
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
/* Setup the IrNET server */
|
||||
|
|
|
|||
|
|
@ -159,14 +159,6 @@ static void
|
|||
DISCOVERY_MODE,
|
||||
void *);
|
||||
#endif
|
||||
/* -------------------------- PROC ENTRY -------------------------- */
|
||||
#ifdef CONFIG_PROC_FS
|
||||
static int
|
||||
irnet_proc_read(char *,
|
||||
char **,
|
||||
off_t,
|
||||
int);
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
/**************************** VARIABLES ****************************/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue