proc tty: add struct tty_operations::proc_fops
Subsystems (9)
PATCH 1/17 proc tty: add struct tty_operations::proc_fops
Used for gradual switch of TTY drivers from using ->read_proc which helps with gradual switch from ->read_proc for the whole tree.
As side effect, fix possible race condition when ->data initialized after PDE is hooked into proc tree.
->proc_fops takes precedence over ->read_proc.
--- fs/proc/proc_tty.c | 19 +++++++++++++------ include/linux/tty_driver.h | 1 + 2 files changed, 14 insertions(+), 6 deletions(-)
fs/proc/proc_tty.c +13 -6
@@ -144,16 +144,23 @@ void proc_tty_register_driver(struct tty_driver *driver) {struct proc_dir_entry *ent; -if (!driver->ops->read_proc || !driver->driver_name || - driver->proc_entry) +if (!driver->driver_name || driver->proc_entry)return ; - ent =create_proc_entry (driver->driver_name,0 , proc_tty_driver); -if (!ent) +if (driver->ops->proc_fops) { + ent =proc_create_data (driver->driver_name,0 , proc_tty_driver, + driver->ops->proc_fops, driver); +if (!ent) +return ; + }else if (driver->ops->read_proc) { + ent =create_proc_entry (driver->driver_name,0 , proc_tty_driver); +if (!ent) +return ; + ent->read_proc = driver->ops->read_proc; + ent->data = driver; + }else return ; - ent->read_proc = driver->ops->read_proc; ent->owner = driver->owner; - ent->data = driver; driver->proc_entry = ent; }
include/linux/tty_driver.h +1 -0
@@ -264,6 +264,7 @@ struct tty_operations {int (*poll_get_char)(struct tty_driver *driver,int line);void (*poll_put_char)(struct tty_driver *driver,int line,char ch);#endif +const struct file_operations *proc_fops; };struct tty_driver {
Signature · 1 line
1.5.6.5
PATCH 2/17 proc tty: switch cyclades to ->proc_fops
--- drivers/char/cyclades.c | 54 +++++++++++++++++----------------------------- 1 files changed, 20 insertions(+), 34 deletions(-)
drivers/char/cyclades.c +20 -34
@@ -657,6 +657,7 @@#include <linux/stat.h> #include <linux/proc_fs.h> +#include <linux/seq_file.h> static void cy_throttle (struct tty_struct *tty);static void cy_send_xchar (struct tty_struct *tty,char ch);
@@ -868,8 +869,6 @@ static int cyz_issue_cmd(struct cyclades_card *, __u32, __u8, __u32);static unsigned detect_isa_irq (void __iomem *);#endif /* CONFIG_ISA */ -static int cyclades_get_proc_info (char *,char **,off_t ,int ,int *,void *); -#ifndef CONFIG_CYZ_INTR static void cyz_poll (unsigned long );
@@ -5216,31 +5215,22 @@ static struct pci_driver cy_pci_driver = { };#endif -static int -cyclades_get_proc_info (char *buf,char **start,off_t offset,int length, -int *eof,void *data) +static int cyclades_proc_show (struct seq_file *m,void *v) {struct cyclades_port *info;unsigned int i, j; -int len =0 ; -off_t begin =0 ; -off_t pos =0 ; -int size;__u32 cur_jifs = jiffies; - size =sprintf (buf,"Dev TimeOpen BytesOut IdleOut BytesIn " +seq_puts (m,"Dev TimeOpen BytesOut IdleOut BytesIn " "IdleIn Overruns Ldisc\n" ); - pos += size; - len += size; -/* Output one line for each known port */ for (i =0 ; i <NR_CARDS ; i++)for (j =0 ; j < cy_card[i].nports; j++) { info = &cy_card[i].ports[j];if (info->port.count) - size = sprintf(buf + len, "%3d %8lu %10lu %8lu " + seq_printf(m, "%3d %8lu %10lu %8lu " "%10lu %8lu %9lu %6ld\n", info->line, (cur_jifs - info->idle_stats.in_use) / HZ, info->idle_stats.xmit_bytes,
@@ -5251,30 +5241,26 @@ cyclades_get_proc_info(char *buf, char **start, off_t offset, int length,/* FIXME: double check locking */ (long)info->port.tty->ldisc.ops->num); else - size =sprintf (buf + len,"%3d %8lu %10lu %8lu " + seq_printf(m, "%3d %8lu %10lu %8lu ""%10lu %8lu %9lu %6ld\n" , info->line, 0L, 0L, 0L, 0L, 0L, 0L, 0L); - len += size; - pos = begin + len; - -if (pos < offset) { - len =0 ; - begin = pos; - } -if (pos > offset + length) - goto done; } - *eof =1 ; -done: - *start = buf + (offset - begin);/* Start of wanted data */ - len -= (offset - begin);/* Start slop */ -if (len > length) - len = length;/* Ending slop */ -if (len <0 ) - len =0 ; -return len; +return 0 ; +} + +static int cyclades_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, cyclades_proc_show,NULL ); } +static const struct file_operations cyclades_proc_fops = { + .owner =THIS_MODULE , + .open = cyclades_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/* The serial driver boot-time initialization code! Hardware I/O ports are mapped to character special devices on a first found, first allocated manner. That is, this code searches
@@ -5311,9 +5297,9 @@ static const struct tty_operations cy_ops = { .hangup = cy_hangup, .break_ctl = cy_break, .wait_until_sent = cy_wait_until_sent, - .read_proc = cyclades_get_proc_info, .tiocmget = cy_tiocmget, .tiocmset = cy_tiocmset, + .proc_fops = &cyclades_proc_fops, };static int __init cy_init (void )
Signature · 1 line
1.5.6.5
PATCH 3/17 proc tty: switch ip2 to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/ip2/ip2main.c | 74 ++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 40 deletions(-)
drivers/char/ip2/ip2main.c +34 -40
@@ -139,7 +139,7 @@#include <linux/seq_file.h> static const struct file_operations ip2mem_proc_fops; -static int ip2_read_proc (char *,char **,off_t ,int ,int *,void * ); +static const struct file_operations ip2_proc_fops;/********************/ /* Type Definitions */
@@ -446,9 +446,9 @@ static const struct tty_operations ip2_ops = { .stop = ip2_stop, .start = ip2_start, .hangup = ip2_hangup, - .read_proc = ip2_read_proc, .tiocmget = ip2_tiocmget, .tiocmset = ip2_tiocmset, + .proc_fops = &ip2_proc_fops, };/******************************************************************************/
@@ -3029,19 +3029,17 @@ static const struct file_operations ip2mem_proc_fops = {* different sources including ip2mkdev.c and a couple of other drivers. * The bugs are all mine. :-) =mhw= */ -static int ip2_read_proc (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int ip2_proc_show (struct seq_file *m,void *v) {int i, j, box; -int len =0 ;int boxes =0 ;int ports =0 ;int tports =0 ; -off_t begin =0 ;i2eBordStrPtr pB; +char *sep; - len +=sprintf (page,"ip2info: 1.0 driver: %s\n" , pcVersion ); - len +=sprintf (page+len,"Driver: SMajor=%d CMajor=%d IMajor=%d MaxBoards=%d MaxBoxes=%d MaxPorts=%d\n" , +seq_printf (m,"ip2info: 1.0 driver: %s\n" , pcVersion); +seq_printf (m,"Driver: SMajor=%d CMajor=%d IMajor=%d MaxBoards=%d MaxBoxes=%d MaxPorts=%d\n" ,IP2_TTY_MAJOR ,IP2_CALLOUT_MAJOR ,IP2_IPL_MAJOR ,IP2_MAX_BOARDS ,ABS_MAX_BOXES ,ABS_BIGGEST_BOX );
@@ -3053,7 +3051,8 @@ static int ip2_read_proc(char *page, char **start, off_t off,switch ( pB->i2ePom.e.porID & ~POR_ID_RESERVED ) {case POR_ID_FIIEX : - len +=sprintf ( page+len,"Board %d: EX ports=" , i ); +seq_printf (m,"Board %d: EX ports=" , i); + sep ="" ;for ( box =0 ; box <ABS_MAX_BOXES ; ++box ) { ports =0 ;
@@ -3065,79 +3064,74 @@ static int ip2_read_proc(char *page, char **start, off_t off, ++ports; } } - len +=sprintf ( page+len,"%d," , ports ); +seq_printf (m,"%s%d" , sep, ports); + sep ="," ; tports += ports; } - - --len;/* Backup over that last comma */ - - len +=sprintf ( page+len," boxes=%d width=%d" , boxes, pB->i2eDataWidth16 ?16 :8 ); +seq_printf (m," boxes=%d width=%d" , boxes, pB->i2eDataWidth16 ?16 :8 );break ;case POR_ID_II_4 : - len +=sprintf (page+len,"Board %d: ISA-4 ports=4 boxes=1" , i ); +seq_printf (m,"Board %d: ISA-4 ports=4 boxes=1" , i); tports = ports =4 ;break ;case POR_ID_II_8 : - len +=sprintf (page+len,"Board %d: ISA-8-std ports=8 boxes=1" , i ); +seq_printf (m,"Board %d: ISA-8-std ports=8 boxes=1" , i); tports = ports =8 ;break ;case POR_ID_II_8R : - len +=sprintf (page+len,"Board %d: ISA-8-RJ11 ports=8 boxes=1" , i ); +seq_printf (m,"Board %d: ISA-8-RJ11 ports=8 boxes=1" , i); tports = ports =8 ;break ;default : - len +=sprintf (page+len,"Board %d: unknown" , i ); +seq_printf (m,"Board %d: unknown" , i);/* Don't try and probe for minor numbers */ tports = ports =0 ; } }else {/* Don't try and probe for minor numbers */ - len +=sprintf (page+len,"Board %d: vacant" , i ); +seq_printf (m,"Board %d: vacant" , i); tports = ports =0 ; }if ( tports ) { - len +=sprintf (page+len," minors=" ); - +seq_puts (m," minors=" ); + sep ="" ;for ( box =0 ; box <ABS_MAX_BOXES ; ++box ) {for ( j =0 ; j <ABS_BIGGEST_BOX ; ++j ) {if ( pB->i2eChannelMap[box] & (1 << j) ) { - len +=sprintf (page+len,"%d," , +seq_printf (m,"%s%d" , sep, j +ABS_BIGGEST_BOX * (box+i*ABS_MAX_BOXES )); + sep ="," ; } } } - - page[ len -1 ] ='\n' ;/* Overwrite that last comma */ - }else { - len +=sprintf (page+len,"\n" ); - } - -if (len+begin > off+count) -break ; -if (len+begin < off) { - begin += len; - len =0 ; } +seq_putc (m,'\n' ); } +return 0 ; + } -if (i >=IP2_MAX_BOARDS ) - *eof =1 ; -if (off >= len+begin) -return 0 ; +static int ip2_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, ip2_proc_show,NULL ); +} - *start = page + (off-begin); -return ((count < begin+len-off) ? count : begin+len-off); - } +static const struct file_operations ip2_proc_fops = { + .owner =THIS_MODULE , + .open = ip2_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};/******************************************************************************/ /* Function: ip2trace() */
Signature · 1 line
1.5.6.5
PATCH 4/17 proc tty: switch istallion to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/istallion.c | 121 ++++++++++++++++++++-------------------------- 1 files changed, 52 insertions(+), 69 deletions(-)
drivers/char/istallion.c +52 -69
@@ -24,6 +24,7 @@#include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/serial.h> +#include <linux/seq_file.h> #include <linux/cdk.h> #include <linux/comstats.h> #include <linux/istallion.h>
@@ -613,7 +614,6 @@ static int stli_breakctl(struct tty_struct *tty, int state);static void stli_waituntilsent (struct tty_struct *tty,int timeout);static void stli_sendxchar (struct tty_struct *tty,char ch);static void stli_hangup (struct tty_struct *tty); -static int stli_portinfo (struct stlibrd *brdp,struct stliport *portp,int portnr,char *pos);static int stli_brdinit (struct stlibrd *brdp);static int stli_startbrd (struct stlibrd *brdp);
@@ -1893,20 +1893,10 @@ static void stli_sendxchar(struct tty_struct *tty, char ch)stli_cmdwait (brdp, portp,A_PORTCTRL , &actrl,sizeof (asyctrl_t),0 ); } -/*****************************************************************************/ - -#define MAXLINE 80 - -/* -* Format info for a specified port. The line is deliberately limited -* to 80 characters. (If it is too long it will be truncated, if too -* short then padded with spaces). -*/ - -static int stli_portinfo (struct stlibrd *brdp,struct stliport *portp,int portnr,char *pos) +static void stli_portinfo (struct seq_file *m,struct stlibrd *brdp,struct stliport *portp,int portnr) { -char *sp, *uart; -int rc, cnt; +char *uart; +int rc; rc =stli_portcmdstats (NULL , portp);
@@ -1918,44 +1908,50 @@ static int stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portndefault :uart ="CD1400" ;break ; } } - - sp = pos; - sp +=sprintf (sp,"%d: uart:%s " , portnr, uart); +seq_printf (m,"%d: uart:%s " , portnr, uart);if ((brdp->state &BST_STARTED ) && (rc >=0 )) { - sp +=sprintf (sp,"tx:%d rx:%d" , (int ) stli_comstats.txtotal, +char sep; + +seq_printf (m,"tx:%d rx:%d" , (int ) stli_comstats.txtotal, (int ) stli_comstats.rxtotal);if (stli_comstats.rxframing) - sp +=sprintf (sp," fe:%d" , +seq_printf (m," fe:%d" , (int ) stli_comstats.rxframing);if (stli_comstats.rxparity) - sp +=sprintf (sp," pe:%d" , +seq_printf (m," pe:%d" , (int ) stli_comstats.rxparity);if (stli_comstats.rxbreaks) - sp +=sprintf (sp," brk:%d" , +seq_printf (m," brk:%d" , (int ) stli_comstats.rxbreaks);if (stli_comstats.rxoverrun) - sp +=sprintf (sp," oe:%d" , +seq_printf (m," oe:%d" , (int ) stli_comstats.rxoverrun); - cnt =sprintf (sp,"%s%s%s%s%s " , - (stli_comstats.signals &TIOCM_RTS ) ?"|RTS" :"" , - (stli_comstats.signals &TIOCM_CTS ) ?"|CTS" :"" , - (stli_comstats.signals &TIOCM_DTR ) ?"|DTR" :"" , - (stli_comstats.signals &TIOCM_CD ) ?"|DCD" :"" , - (stli_comstats.signals &TIOCM_DSR ) ?"|DSR" :"" ); - *sp =' ' ; - sp += cnt; + sep =' ' ; +if (stli_comstats.signals &TIOCM_RTS ) { +seq_printf (m,"%c%s" , sep,"RTS" ); + sep ='|' ; + } +if (stli_comstats.signals &TIOCM_CTS ) { +seq_printf (m,"%c%s" , sep,"CTS" ); + sep ='|' ; + } +if (stli_comstats.signals &TIOCM_DTR ) { +seq_printf (m,"%c%s" , sep,"DTR" ); + sep ='|' ; + } +if (stli_comstats.signals &TIOCM_CD ) { +seq_printf (m,"%c%s" , sep,"DCD" ); + sep ='|' ; + } +if (stli_comstats.signals &TIOCM_DSR ) { +seq_printf (m,"%c%s" , sep,"DSR" ); + sep ='|' ; + } } - -for (cnt = (sp - pos); (cnt < (MAXLINE -1 )); cnt++) - *sp++ =' ' ; -if (cnt >=MAXLINE ) - pos[(MAXLINE -2 )] ='+' ; - pos[(MAXLINE -1 )] ='\n' ; - -return (MAXLINE ); +seq_putc (m,'\n' ); }/*****************************************************************************/
@@ -1964,26 +1960,15 @@ static int stli_portinfo(struct stlibrd *brdp, struct stliport *portp, int portn* Port info, read from the /proc file system. */ -static int stli_readproc (char *page,char **start,off_t off,int count,int *eof,void *data) +static int stli_proc_show (struct seq_file *m,void *v) {struct stlibrd *brdp;struct stliport *portp;unsigned int brdnr, portnr, totalport; -int curoff, maxoff; -char *pos; - pos = page; totalport =0 ; - curoff =0 ; - -if (off ==0 ) { - pos +=sprintf (pos,"%s: version %s" , stli_drvtitle, - stli_drvversion); -while (pos < (page +MAXLINE -1 )) - *pos++ =' ' ; - *pos++ ='\n' ; - } - curoff =MAXLINE ; + +seq_printf (m,"%s: version %s\n" , stli_drvtitle, stli_drvversion);/* * We scan through for each board, panel and port. The offset is
@@ -1996,33 +1981,31 @@ static int stli_readproc(char *page, char **start, off_t off, int count, int *eoif (brdp->state ==0 )continue ; - maxoff = curoff + (brdp->nrports *MAXLINE ); -if (off >= maxoff) { - curoff = maxoff; -continue ; - } - totalport = brdnr *STL_MAXPORTS ;for (portnr =0 ; (portnr < brdp->nrports); portnr++, totalport++) { portp = brdp->ports[portnr];if (portp ==NULL )continue ; -if (off >= (curoff +=MAXLINE )) -continue ; -if ((pos - page +MAXLINE ) > count) - goto stli_readdone; - pos +=stli_portinfo (brdp, portp, totalport, pos); +stli_portinfo (m, brdp, portp, totalport); } } +return 0 ; +} - *eof =1 ; - -stli_readdone: - *start = page; -return (pos - page); +static int stli_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, stli_proc_show,NULL ); } +static const struct file_operations stli_proc_fops = { + .owner =THIS_MODULE , + .open = stli_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/*****************************************************************************/ /*
@@ -4427,9 +4410,9 @@ static const struct tty_operations stli_ops = { .break_ctl = stli_breakctl, .wait_until_sent = stli_waituntilsent, .send_xchar = stli_sendxchar, - .read_proc = stli_readproc, .tiocmget = stli_tiocmget, .tiocmset = stli_tiocmset, + .proc_fops = &stli_proc_fops, };static const struct tty_port_operations stli_port_ops = {
Signature · 1 line
1.5.6.5
PATCH 5/17 proc tty: switch synclink_cs to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/pcmcia/synclink_cs.c | 73 +++++++++++++++++-------------------- 1 files changed, 34 insertions(+), 39 deletions(-)
drivers/char/pcmcia/synclink_cs.c +34 -39
@@ -51,6 +51,7 @@#include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/mm.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/netdevice.h> #include <linux/vmalloc.h>
@@ -2619,13 +2620,12 @@ cleanup:* /proc fs routines.... */ -static inline int line_info (char *buf,MGSLPC_INFO *info) +static inline void line_info (struct seq_file *m,MGSLPC_INFO *info) {char stat_buf[30 ]; -int ret;unsigned long flags; - ret =sprintf (buf,"%s:io:%04X irq:%d" , +seq_printf (m,"%s:io:%04X irq:%d" , info->device_name, info->io_base, info->irq_level);/* output current serial signal states */
@@ -2649,75 +2649,70 @@ static inline int line_info(char *buf, MGSLPC_INFO *info)strcat (stat_buf,"|RI" );if (info->params.mode ==MGSL_MODE_HDLC ) { - ret +=sprintf (buf+ret," HDLC txok:%d rxok:%d" , +seq_printf (m," HDLC txok:%d rxok:%d" , info->icount.txok, info->icount.rxok);if (info->icount.txunder) - ret +=sprintf (buf+ret," txunder:%d" , info->icount.txunder); +seq_printf (m," txunder:%d" , info->icount.txunder);if (info->icount.txabort) - ret +=sprintf (buf+ret," txabort:%d" , info->icount.txabort); +seq_printf (m," txabort:%d" , info->icount.txabort);if (info->icount.rxshort) - ret +=sprintf (buf+ret," rxshort:%d" , info->icount.rxshort); +seq_printf (m," rxshort:%d" , info->icount.rxshort);if (info->icount.rxlong) - ret +=sprintf (buf+ret," rxlong:%d" , info->icount.rxlong); +seq_printf (m," rxlong:%d" , info->icount.rxlong);if (info->icount.rxover) - ret +=sprintf (buf+ret," rxover:%d" , info->icount.rxover); +seq_printf (m," rxover:%d" , info->icount.rxover);if (info->icount.rxcrc) - ret +=sprintf (buf+ret," rxcrc:%d" , info->icount.rxcrc); +seq_printf (m," rxcrc:%d" , info->icount.rxcrc); }else { - ret +=sprintf (buf+ret," ASYNC tx:%d rx:%d" , +seq_printf (m," ASYNC tx:%d rx:%d" , info->icount.tx, info->icount.rx);if (info->icount.frame) - ret +=sprintf (buf+ret," fe:%d" , info->icount.frame); +seq_printf (m," fe:%d" , info->icount.frame);if (info->icount.parity) - ret +=sprintf (buf+ret," pe:%d" , info->icount.parity); +seq_printf (m," pe:%d" , info->icount.parity);if (info->icount.brk) - ret +=sprintf (buf+ret," brk:%d" , info->icount.brk); +seq_printf (m," brk:%d" , info->icount.brk);if (info->icount.overrun) - ret +=sprintf (buf+ret," oe:%d" , info->icount.overrun); +seq_printf (m," oe:%d" , info->icount.overrun); }/* Append serial signal status to end */ - ret +=sprintf (buf+ret," %s\n" , stat_buf+1 ); +seq_printf (m," %s\n" , stat_buf+1 ); - ret +=sprintf (buf+ret,"txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , +seq_printf (m,"txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , info->tx_active,info->bh_requested,info->bh_running, info->pending_bh); - -return ret; }/* Called to print information about devices */ -static int mgslpc_read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int mgslpc_proc_show (struct seq_file *m,void *v) { -int len =0 , l; -off_t begin =0 ;MGSLPC_INFO *info; - len +=sprintf (page,"synclink driver:%s\n" , driver_version); +seq_printf (m,"synclink driver:%s\n" , driver_version); info = mgslpc_device_list;while ( info ) { - l =line_info (page + len, info); - len += l; -if (len+begin > off+count) - goto done; -if (len+begin < off) { - begin += len; - len =0 ; - } +line_info (m, info); info = info->next_device; } +return 0 ; +} - *eof =1 ; -done: -if (off >= len+begin) -return 0 ; - *start = page + (off-begin); -return ((count < begin+len-off) ? count : begin+len-off); +static int mgslpc_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, mgslpc_proc_show,NULL ); } +static const struct file_operations mgslpc_proc_fops = { + .owner =THIS_MODULE , + .open = mgslpc_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +static int rx_alloc_buffers (MGSLPC_INFO *info) {/* each buffer has header and data */
@@ -2861,13 +2856,13 @@ static const struct tty_operations mgslpc_ops = { .send_xchar = mgslpc_send_xchar, .break_ctl = mgslpc_break, .wait_until_sent = mgslpc_wait_until_sent, - .read_proc = mgslpc_read_proc, .set_termios = mgslpc_set_termios, .stop = tx_pause, .start = tx_release, .hangup = mgslpc_hangup, .tiocmget = tiocmget, .tiocmset = tiocmset, + .proc_fops = &mgslpc_proc_fops, };static void synclink_cs_cleanup (void )
Signature · 1 line
1.5.6.5
PATCH 6/17 proc tty: switch stallion to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/stallion.c | 126 +++++++++++++++++++---------------------------- 1 files changed, 50 insertions(+), 76 deletions(-)
drivers/char/stallion.c +50 -76
@@ -32,6 +32,7 @@#include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/serial.h> +#include <linux/seq_file.h> #include <linux/cd1400.h> #include <linux/sc26198.h> #include <linux/comstats.h>
@@ -1379,52 +1380,47 @@ static void stl_sendxchar(struct tty_struct *tty, char ch)stl_putchar (tty, ch); } -/*****************************************************************************/ - -#define MAXLINE 80 - -/* -* Format info for a specified port. The line is deliberately limited -* to 80 characters. (If it is too long it will be truncated, if too -* short then padded with spaces). -*/ - -static int stl_portinfo (struct stlport *portp,int portnr,char *pos) +static void stl_portinfo (struct seq_file *m,struct stlport *portp,int portnr) { -char *sp; -int sigs, cnt; +int sigs; +char sep; - sp = pos; - sp +=sprintf (sp,"%d: uart:%s tx:%d rx:%d" , +seq_printf (m,"%d: uart:%s tx:%d rx:%d" , portnr, (portp->hwid ==1 ) ?"SC26198" :"CD1400" , (int ) portp->stats.txtotal, (int ) portp->stats.rxtotal);if (portp->stats.rxframing) - sp +=sprintf (sp," fe:%d" , (int ) portp->stats.rxframing); +seq_printf (m," fe:%d" , (int ) portp->stats.rxframing);if (portp->stats.rxparity) - sp +=sprintf (sp," pe:%d" , (int ) portp->stats.rxparity); +seq_printf (m," pe:%d" , (int ) portp->stats.rxparity);if (portp->stats.rxbreaks) - sp +=sprintf (sp," brk:%d" , (int ) portp->stats.rxbreaks); +seq_printf (m," brk:%d" , (int ) portp->stats.rxbreaks);if (portp->stats.rxoverrun) - sp +=sprintf (sp," oe:%d" , (int ) portp->stats.rxoverrun); +seq_printf (m," oe:%d" , (int ) portp->stats.rxoverrun); sigs =stl_getsignals (portp); - cnt =sprintf (sp,"%s%s%s%s%s " , - (sigs &TIOCM_RTS ) ?"|RTS" :"" , - (sigs &TIOCM_CTS ) ?"|CTS" :"" , - (sigs &TIOCM_DTR ) ?"|DTR" :"" , - (sigs &TIOCM_CD ) ?"|DCD" :"" , - (sigs &TIOCM_DSR ) ?"|DSR" :"" ); - *sp =' ' ; - sp += cnt; - -for (cnt = sp - pos; cnt < (MAXLINE -1 ); cnt++) - *sp++ =' ' ; -if (cnt >=MAXLINE ) - pos[(MAXLINE -2 )] ='+' ; - pos[(MAXLINE -1 )] ='\n' ; - -return MAXLINE ; + sep =' ' ; +if (sigs &TIOCM_RTS ) { +seq_printf (m,"%c%s" , sep,"RTS" ); + sep ='|' ; + } +if (sigs &TIOCM_CTS ) { +seq_printf (m,"%c%s" , sep,"CTS" ); + sep ='|' ; + } +if (sigs &TIOCM_DTR ) { +seq_printf (m,"%c%s" , sep,"DTR" ); + sep ='|' ; + } +if (sigs &TIOCM_CD ) { +seq_printf (m,"%c%s" , sep,"DCD" ); + sep ='|' ; + } +if (sigs &TIOCM_DSR ) { +seq_printf (m,"%c%s" , sep,"DSR" ); + sep ='|' ; + } +seq_putc (m,'\n' ); }/*****************************************************************************/
@@ -1433,30 +1429,17 @@ static int stl_portinfo(struct stlport *portp, int portnr, char *pos)* Port info, read from the /proc file system. */ -static int stl_readproc (char *page,char **start,off_t off,int count,int *eof,void *data) +static int stl_proc_show (struct seq_file *m,void *v) {struct stlbrd *brdp;struct stlpanel *panelp;struct stlport *portp;unsigned int brdnr, panelnr, portnr; -int totalport, curoff, maxoff; -char *pos; +int totalport; -pr_debug ("stl_readproc(page=%p,start=%p,off=%lx,count=%d,eof=%p," -"data=%p\n" , page, start, off, count, eof, data); - - pos = page; totalport =0 ; - curoff =0 ; - -if (off ==0 ) { - pos +=sprintf (pos,"%s: version %s" , stl_drvtitle, - stl_drvversion); -while (pos < (page +MAXLINE -1 )) - *pos++ =' ' ; - *pos++ ='\n' ; - } - curoff =MAXLINE ; + +seq_printf (m,"%s: version %s\n" , stl_drvtitle, stl_drvversion);/* * We scan through for each board, panel and port. The offset is
@@ -1469,46 +1452,37 @@ static int stl_readproc(char *page, char **start, off_t off, int count, int *eofif (brdp->state ==0 )continue ; - maxoff = curoff + (brdp->nrports *MAXLINE ); -if (off >= maxoff) { - curoff = maxoff; -continue ; - } - totalport = brdnr *STL_MAXPORTS ;for (panelnr =0 ; panelnr < brdp->nrpanels; panelnr++) { panelp = brdp->panels[panelnr];if (panelp ==NULL )continue ; - maxoff = curoff + (panelp->nrports *MAXLINE ); -if (off >= maxoff) { - curoff = maxoff; - totalport += panelp->nrports; -continue ; - } -for (portnr =0 ; portnr < panelp->nrports; portnr++, totalport++) { portp = panelp->ports[portnr];if (portp ==NULL )continue ; -if (off >= (curoff +=MAXLINE )) -continue ; -if ((pos - page +MAXLINE ) > count) - goto stl_readdone; - pos +=stl_portinfo (portp, totalport, pos); +stl_portinfo (m, portp, totalport); } } } +return 0 ; +} - *eof =1 ; - -stl_readdone: - *start = page; -return pos - page; +static int stl_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, stl_proc_show,NULL ); } +static const struct file_operations stl_proc_fops = { + .owner =THIS_MODULE , + .open = stl_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/*****************************************************************************/ /*
@@ -2566,9 +2540,9 @@ static const struct tty_operations stl_ops = { .break_ctl = stl_breakctl, .wait_until_sent = stl_waituntilsent, .send_xchar = stl_sendxchar, - .read_proc = stl_readproc, .tiocmget = stl_tiocmget, .tiocmset = stl_tiocmset, + .proc_fops = &stl_proc_fops, };static const struct tty_port_operations stl_port_ops = {
Signature · 1 line
1.5.6.5
PATCH 7/17 proc tty: switch synclink to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/synclink.c | 98 +++++++++++++++++++---------------------------- 1 files changed, 39 insertions(+), 59 deletions(-)
drivers/char/synclink.c +39 -59
@@ -79,6 +79,7 @@#include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/mm.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/netdevice.h>
@@ -3459,18 +3460,17 @@ cleanup:* /proc fs routines.... */ -static inline int line_info (char *buf,struct mgsl_struct *info) +static inline void line_info (struct seq_file *m,struct mgsl_struct *info) {char stat_buf[30 ]; -int ret;unsigned long flags;if (info->bus_type ==MGSL_BUS_TYPE_PCI ) { - ret =sprintf (buf,"%s:PCI io:%04X irq:%d mem:%08X lcr:%08X" , +seq_printf (m,"%s:PCI io:%04X irq:%d mem:%08X lcr:%08X" , info->device_name, info->io_base, info->irq_level, info->phys_memory_base, info->phys_lcr_base); }else { - ret =sprintf (buf,"%s:(E)ISA io:%04X irq:%d dma:%d" , +seq_printf (m,"%s:(E)ISA io:%04X irq:%d dma:%d" , info->device_name, info->io_base, info->irq_level, info->dma_level); }
@@ -3497,37 +3497,37 @@ static inline int line_info(char *buf, struct mgsl_struct *info)if (info->params.mode ==MGSL_MODE_HDLC || info->params.mode ==MGSL_MODE_RAW ) { - ret +=sprintf (buf+ret," HDLC txok:%d rxok:%d" , +seq_printf (m," HDLC txok:%d rxok:%d" , info->icount.txok, info->icount.rxok);if (info->icount.txunder) - ret +=sprintf (buf+ret," txunder:%d" , info->icount.txunder); +seq_printf (m," txunder:%d" , info->icount.txunder);if (info->icount.txabort) - ret +=sprintf (buf+ret," txabort:%d" , info->icount.txabort); +seq_printf (m," txabort:%d" , info->icount.txabort);if (info->icount.rxshort) - ret +=sprintf (buf+ret," rxshort:%d" , info->icount.rxshort); +seq_printf (m," rxshort:%d" , info->icount.rxshort);if (info->icount.rxlong) - ret +=sprintf (buf+ret," rxlong:%d" , info->icount.rxlong); +seq_printf (m," rxlong:%d" , info->icount.rxlong);if (info->icount.rxover) - ret +=sprintf (buf+ret," rxover:%d" , info->icount.rxover); +seq_printf (m," rxover:%d" , info->icount.rxover);if (info->icount.rxcrc) - ret +=sprintf (buf+ret," rxcrc:%d" , info->icount.rxcrc); +seq_printf (m," rxcrc:%d" , info->icount.rxcrc); }else { - ret +=sprintf (buf+ret," ASYNC tx:%d rx:%d" , +seq_printf (m," ASYNC tx:%d rx:%d" , info->icount.tx, info->icount.rx);if (info->icount.frame) - ret +=sprintf (buf+ret," fe:%d" , info->icount.frame); +seq_printf (m," fe:%d" , info->icount.frame);if (info->icount.parity) - ret +=sprintf (buf+ret," pe:%d" , info->icount.parity); +seq_printf (m," pe:%d" , info->icount.parity);if (info->icount.brk) - ret +=sprintf (buf+ret," brk:%d" , info->icount.brk); +seq_printf (m," brk:%d" , info->icount.brk);if (info->icount.overrun) - ret +=sprintf (buf+ret," oe:%d" , info->icount.overrun); +seq_printf (m," oe:%d" , info->icount.overrun); }/* Append serial signal status to end */ - ret +=sprintf (buf+ret," %s\n" , stat_buf+1 ); +seq_printf (m," %s\n" , stat_buf+1 ); - ret +=sprintf (buf+ret,"txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , +seq_printf (m,"txactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , info->tx_active,info->bh_requested,info->bh_running, info->pending_bh);
@@ -3544,60 +3544,40 @@ static inline int line_info(char *buf, struct mgsl_struct *info)u16 Tmr =usc_InReg ( info,TMR );u16 Tccr =usc_InReg ( info,TCCR );u16 Ccar =inw ( info->io_base +CCAR ); - ret +=sprintf (buf+ret,"tcsr=%04X tdmr=%04X ticr=%04X rcsr=%04X rdmr=%04X\n" +seq_printf (m,"tcsr=%04X tdmr=%04X ticr=%04X rcsr=%04X rdmr=%04X\n" "ricr=%04X icr =%04X dccr=%04X tmr=%04X tccr=%04X ccar=%04X\n" , Tcsr,Tdmr,Ticr,Rscr,Rdmr,Ricr,Icr,Dccr,Tmr,Tccr,Ccar ); }spin_unlock_irqrestore (&info->irq_spinlock,flags); - -return ret; - -}/* end of line_info() */ +} -/* mgsl_read_proc() -* -* Called to print information about devices -* -* Arguments: -* page page of memory to hold returned info -* start -* off -* count -* eof -* data -* -* Return Value: -*/ -static int mgsl_read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +/* Called to print information about devices */ +static int mgsl_proc_show (struct seq_file *m,void *v) { -int len =0 , l; -off_t begin =0 ;struct mgsl_struct *info; - len +=sprintf (page,"synclink driver:%s\n" , driver_version); +seq_printf (m,"synclink driver:%s\n" , driver_version); info = mgsl_device_list;while ( info ) { - l =line_info (page + len, info); - len += l; -if (len+begin > off+count) - goto done; -if (len+begin < off) { - begin += len; - len =0 ; - } +line_info (m, info); info = info->next_device; } +return 0 ; +} - *eof =1 ; -done: -if (off >= len+begin) -return 0 ; - *start = page + (off-begin); -return ((count < begin+len-off) ? count : begin+len-off); - -}/* end of mgsl_read_proc() */ +static int mgsl_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, mgsl_proc_show,NULL ); +} + +static const struct file_operations mgsl_proc_fops = { + .owner =THIS_MODULE , + .open = mgsl_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};/* mgsl_allocate_dma_buffers() *
@@ -4335,13 +4315,13 @@ static const struct tty_operations mgsl_ops = { .send_xchar = mgsl_send_xchar, .break_ctl = mgsl_break, .wait_until_sent = mgsl_wait_until_sent, - .read_proc = mgsl_read_proc, .set_termios = mgsl_set_termios, .stop = mgsl_stop, .start = mgsl_start, .hangup = mgsl_hangup, .tiocmget = tiocmget, .tiocmset = tiocmset, + .proc_fops = &mgsl_proc_fops, };/*
Signature · 1 line
1.5.6.5
PATCH 8/17 proc tty: switch synclink_gt to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/synclink_gt.c | 74 ++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 40 deletions(-)
drivers/char/synclink_gt.c +34 -40
@@ -60,6 +60,7 @@#include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/mm.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/netdevice.h> #include <linux/vmalloc.h>
@@ -154,7 +155,6 @@ static void tx_hold(struct tty_struct *tty);static void tx_release (struct tty_struct *tty);static int ioctl (struct tty_struct *tty,struct file *file,unsigned int cmd,unsigned long arg); -static int read_proc (char *page,char **start,off_t off,int count,int *eof,void *data);static int chars_in_buffer (struct tty_struct *tty);static void throttle (struct tty_struct * tty);static void unthrottle (struct tty_struct * tty);
@@ -1229,13 +1229,12 @@ static long slgt_compat_ioctl(struct tty_struct *tty, struct file *file,/* * proc fs support */ -static inline int line_info (char *buf,struct slgt_info *info) +static inline void line_info (struct seq_file *m,struct slgt_info *info) {char stat_buf[30 ]; -int ret;unsigned long flags; - ret =sprintf (buf,"%s: IO=%08X IRQ=%d MaxFrameSize=%u\n" , +seq_printf (m,"%s: IO=%08X IRQ=%d MaxFrameSize=%u\n" , info->device_name, info->phys_reg_addr, info->irq_level, info->max_frame_size);
@@ -1260,75 +1259,70 @@ static inline int line_info(char *buf, struct slgt_info *info)strcat (stat_buf,"|RI" );if (info->params.mode !=MGSL_MODE_ASYNC ) { - ret +=sprintf (buf+ret,"\tHDLC txok:%d rxok:%d" , +seq_printf (m,"\tHDLC txok:%d rxok:%d" , info->icount.txok, info->icount.rxok);if (info->icount.txunder) - ret +=sprintf (buf+ret," txunder:%d" , info->icount.txunder); +seq_printf (m," txunder:%d" , info->icount.txunder);if (info->icount.txabort) - ret +=sprintf (buf+ret," txabort:%d" , info->icount.txabort); +seq_printf (m," txabort:%d" , info->icount.txabort);if (info->icount.rxshort) - ret +=sprintf (buf+ret," rxshort:%d" , info->icount.rxshort); +seq_printf (m," rxshort:%d" , info->icount.rxshort);if (info->icount.rxlong) - ret +=sprintf (buf+ret," rxlong:%d" , info->icount.rxlong); +seq_printf (m," rxlong:%d" , info->icount.rxlong);if (info->icount.rxover) - ret +=sprintf (buf+ret," rxover:%d" , info->icount.rxover); +seq_printf (m," rxover:%d" , info->icount.rxover);if (info->icount.rxcrc) - ret +=sprintf (buf+ret," rxcrc:%d" , info->icount.rxcrc); +seq_printf (m," rxcrc:%d" , info->icount.rxcrc); }else { - ret +=sprintf (buf+ret,"\tASYNC tx:%d rx:%d" , +seq_printf (m,"\tASYNC tx:%d rx:%d" , info->icount.tx, info->icount.rx);if (info->icount.frame) - ret +=sprintf (buf+ret," fe:%d" , info->icount.frame); +seq_printf (m," fe:%d" , info->icount.frame);if (info->icount.parity) - ret +=sprintf (buf+ret," pe:%d" , info->icount.parity); +seq_printf (m," pe:%d" , info->icount.parity);if (info->icount.brk) - ret +=sprintf (buf+ret," brk:%d" , info->icount.brk); +seq_printf (m," brk:%d" , info->icount.brk);if (info->icount.overrun) - ret +=sprintf (buf+ret," oe:%d" , info->icount.overrun); +seq_printf (m," oe:%d" , info->icount.overrun); }/* Append serial signal status to end */ - ret +=sprintf (buf+ret," %s\n" , stat_buf+1 ); +seq_printf (m," %s\n" , stat_buf+1 ); - ret +=sprintf (buf+ret,"\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , +seq_printf (m,"\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , info->tx_active,info->bh_requested,info->bh_running, info->pending_bh); - -return ret; }/* Called to print information about devices */ -static int read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int synclink_gt_proc_show (struct seq_file *m,void *v) { -int len =0 , l; -off_t begin =0 ;struct slgt_info *info; - len +=sprintf (page,"synclink_gt driver\n" ); +seq_puts (m,"synclink_gt driver\n" ); info = slgt_device_list;while ( info ) { - l =line_info (page + len, info); - len += l; -if (len+begin > off+count) - goto done; -if (len+begin < off) { - begin += len; - len =0 ; - } +line_info (m, info); info = info->next_device; } +return 0 ; +} - *eof =1 ; -done: -if (off >= len+begin) -return 0 ; - *start = page + (off-begin); -return ((count < begin+len-off) ? count : begin+len-off); +static int synclink_gt_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, synclink_gt_proc_show,NULL ); } +static const struct file_operations synclink_gt_proc_fops = { + .owner =THIS_MODULE , + .open = synclink_gt_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/* * return count of bytes in transmit buffer */
@@ -3558,13 +3552,13 @@ static const struct tty_operations ops = { .send_xchar = send_xchar, .break_ctl = set_break, .wait_until_sent = wait_until_sent, - .read_proc = read_proc, .set_termios = set_termios, .stop = tx_hold, .start = tx_release, .hangup = hangup, .tiocmget = tiocmget, .tiocmset = tiocmset, + .proc_fops = &synclink_gt_proc_fops, };static void slgt_cleanup (void )
Signature · 1 line
1.5.6.5
PATCH 9/17 proc tty: switch synclinkmp to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/synclinkmp.c | 74 ++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 40 deletions(-)
drivers/char/synclinkmp.c +34 -40
@@ -50,6 +50,7 @@#include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/mm.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/netdevice.h> #include <linux/vmalloc.h>
@@ -520,7 +521,6 @@ static void tx_hold(struct tty_struct *tty);static void tx_release (struct tty_struct *tty);static int ioctl (struct tty_struct *tty,struct file *file,unsigned int cmd,unsigned long arg); -static int read_proc (char *page,char **start,off_t off,int count,int *eof,void *data);static int chars_in_buffer (struct tty_struct *tty);static void throttle (struct tty_struct * tty);static void unthrottle (struct tty_struct * tty);
@@ -1354,13 +1354,12 @@ static int ioctl(struct tty_struct *tty, struct file *file,* /proc fs routines.... */ -static inline int line_info (char *buf,SLMP_INFO *info) +static inline void line_info (struct seq_file *m,SLMP_INFO *info) {char stat_buf[30 ]; -int ret;unsigned long flags; - ret = sprintf(buf, "%s: SCABase=%08x Mem=%08X StatusControl=%08x LCR=%08X\n" + seq_printf(m, "%s: SCABase=%08x Mem=%08X StatusControl=%08x LCR=%08X\n" "\tIRQ=%d MaxFrameSize=%u\n", info->device_name, info->phys_sca_base,
@@ -1391,75 +1390,70 @@ static inline int line_info(char *buf, SLMP_INFO *info)strcat (stat_buf,"|RI" );if (info->params.mode ==MGSL_MODE_HDLC ) { - ret +=sprintf (buf+ret,"\tHDLC txok:%d rxok:%d" , +seq_printf (m,"\tHDLC txok:%d rxok:%d" , info->icount.txok, info->icount.rxok);if (info->icount.txunder) - ret +=sprintf (buf+ret," txunder:%d" , info->icount.txunder); +seq_printf (m," txunder:%d" , info->icount.txunder);if (info->icount.txabort) - ret +=sprintf (buf+ret," txabort:%d" , info->icount.txabort); +seq_printf (m," txabort:%d" , info->icount.txabort);if (info->icount.rxshort) - ret +=sprintf (buf+ret," rxshort:%d" , info->icount.rxshort); +seq_printf (m," rxshort:%d" , info->icount.rxshort);if (info->icount.rxlong) - ret +=sprintf (buf+ret," rxlong:%d" , info->icount.rxlong); +seq_printf (m," rxlong:%d" , info->icount.rxlong);if (info->icount.rxover) - ret +=sprintf (buf+ret," rxover:%d" , info->icount.rxover); +seq_printf (m," rxover:%d" , info->icount.rxover);if (info->icount.rxcrc) - ret +=sprintf (buf+ret," rxlong:%d" , info->icount.rxcrc); +seq_printf (m," rxlong:%d" , info->icount.rxcrc); }else { - ret +=sprintf (buf+ret,"\tASYNC tx:%d rx:%d" , +seq_printf (m,"\tASYNC tx:%d rx:%d" , info->icount.tx, info->icount.rx);if (info->icount.frame) - ret +=sprintf (buf+ret," fe:%d" , info->icount.frame); +seq_printf (m," fe:%d" , info->icount.frame);if (info->icount.parity) - ret +=sprintf (buf+ret," pe:%d" , info->icount.parity); +seq_printf (m," pe:%d" , info->icount.parity);if (info->icount.brk) - ret +=sprintf (buf+ret," brk:%d" , info->icount.brk); +seq_printf (m," brk:%d" , info->icount.brk);if (info->icount.overrun) - ret +=sprintf (buf+ret," oe:%d" , info->icount.overrun); +seq_printf (m," oe:%d" , info->icount.overrun); }/* Append serial signal status to end */ - ret +=sprintf (buf+ret," %s\n" , stat_buf+1 ); +seq_printf (m," %s\n" , stat_buf+1 ); - ret +=sprintf (buf+ret,"\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , +seq_printf (m,"\ttxactive=%d bh_req=%d bh_run=%d pending_bh=%x\n" , info->tx_active,info->bh_requested,info->bh_running, info->pending_bh); - -return ret; }/* Called to print information about devices */ -static int read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int synclinkmp_proc_show (struct seq_file *m,void *v) { -int len =0 , l; -off_t begin =0 ;SLMP_INFO *info; - len +=sprintf (page,"synclinkmp driver:%s\n" , driver_version); +seq_printf (m,"synclinkmp driver:%s\n" , driver_version); info = synclinkmp_device_list;while ( info ) { - l =line_info (page + len, info); - len += l; -if (len+begin > off+count) - goto done; -if (len+begin < off) { - begin += len; - len =0 ; - } +line_info (m, info); info = info->next_device; } +return 0 ; +} - *eof =1 ; -done: -if (off >= len+begin) -return 0 ; - *start = page + (off-begin); -return ((count < begin+len-off) ? count : begin+len-off); +static int synclinkmp_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, synclinkmp_proc_show,NULL ); } +static const struct file_operations synclinkmp_proc_fops = { + .owner =THIS_MODULE , + .open = synclinkmp_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/* Return the count of bytes in transmit buffer */ static int chars_in_buffer (struct tty_struct *tty)
@@ -3901,13 +3895,13 @@ static const struct tty_operations ops = { .send_xchar = send_xchar, .break_ctl = set_break, .wait_until_sent = wait_until_sent, - .read_proc = read_proc, .set_termios = set_termios, .stop = tx_hold, .start = tx_release, .hangup = hangup, .tiocmget = tiocmget, .tiocmset = tiocmset, + .proc_fops = &synclinkmp_proc_fops, };
Signature · 1 line
1.5.6.5
PATCH 10/17 proc tty: switch sdio_uart to ->proc_fops
In reply to Alexey Dobriyan--- drivers/mmc/card/sdio_uart.c | 62 ++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 32 deletions(-)
drivers/mmc/card/sdio_uart.c +30 -32
@@ -30,6 +30,7 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/mutex.h> +#include <linux/seq_file.h> #include <linux/serial_reg.h> #include <linux/circ_buf.h> #include <linux/gfp.h>
@@ -933,67 +934,64 @@ static int sdio_uart_tiocmset(struct tty_struct *tty, struct file *file,return result; } -static int sdio_uart_read_proc (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int sdio_uart_proc_show (struct seq_file *m,void *v) { -int i, len =0 ; -off_t begin =0 ; +int i; - len +=sprintf (page,"serinfo:1.0 driver%s%s revision:%s\n" , +seq_printf (m,"serinfo:1.0 driver%s%s revision:%s\n" ,"" ,"" ,"" ); -for (i =0 ; i <UART_NR && len <PAGE_SIZE -96 ; i++) { +for (i =0 ; i <UART_NR ; i++) {struct sdio_uart_port *port =sdio_uart_port_get (i);if (port) { - len +=sprintf (page+len,"%d: uart:SDIO" , i); +seq_printf (m,"%d: uart:SDIO" , i);if (capable (CAP_SYS_ADMIN )) { - len +=sprintf (page + len," tx:%d rx:%d" , +seq_printf (m," tx:%d rx:%d" , port->icount.tx, port->icount.rx);if (port->icount.frame) - len +=sprintf (page + len," fe:%d" , +seq_printf (m," fe:%d" , port->icount.frame);if (port->icount.parity) - len +=sprintf (page + len," pe:%d" , +seq_printf (m," pe:%d" , port->icount.parity);if (port->icount.brk) - len +=sprintf (page + len," brk:%d" , +seq_printf (m," brk:%d" , port->icount.brk);if (port->icount.overrun) - len +=sprintf (page + len," oe:%d" , +seq_printf (m," oe:%d" , port->icount.overrun);if (port->icount.cts) - len +=sprintf (page + len," cts:%d" , +seq_printf (m," cts:%d" , port->icount.cts);if (port->icount.dsr) - len +=sprintf (page + len," dsr:%d" , +seq_printf (m," dsr:%d" , port->icount.dsr);if (port->icount.rng) - len +=sprintf (page + len," rng:%d" , +seq_printf (m," rng:%d" , port->icount.rng);if (port->icount.dcd) - len +=sprintf (page + len," dcd:%d" , +seq_printf (m," dcd:%d" , port->icount.dcd); } -strcat (page,"\n" ); - len++;sdio_uart_port_put (port); - } - -if (len + begin > off + count) - goto done; -if (len + begin < off) { - begin += len; - len =0 ; +seq_putc (m,'\n' ); } } - *eof =1 ; +return 0 ; +} -done: -if (off >= len + begin) -return 0 ; - *start = page + (off - begin); -return (count < begin + len - off) ? count : (begin + len - off); +static int sdio_uart_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, sdio_uart_proc_show,NULL ); } +static const struct file_operations sdio_uart_proc_fops = { + .owner =THIS_MODULE , + .open = sdio_uart_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +static const struct tty_operations sdio_uart_ops = { .open = sdio_uart_open, .close = sdio_uart_close,
@@ -1007,7 +1005,7 @@ static const struct tty_operations sdio_uart_ops = { .break_ctl = sdio_uart_break_ctl, .tiocmget = sdio_uart_tiocmget, .tiocmset = sdio_uart_tiocmset, - .read_proc = sdio_uart_read_proc, + .proc_fops = &sdio_uart_proc_fops, };static struct tty_driver *sdio_uart_tty_driver;
Signature · 1 line
1.5.6.5
PATCH 11/17 proc tty: switch serial_core to ->proc_fops
In reply to Alexey Dobriyan--- drivers/serial/serial_core.c | 76 ++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 40 deletions(-)
drivers/serial/serial_core.c +36 -40
@@ -27,6 +27,8 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/console.h> +#include <linux/proc_fs.h> +#include <linux/seq_file.h> #include <linux/serial_core.h> #include <linux/smp_lock.h> #include <linux/device.h>
@@ -1682,20 +1684,20 @@ static const char *uart_type(struct uart_port *port)#ifdef CONFIG_PROC_FS -static int uart_line_info (char *buf,struct uart_driver *drv,int i) +static void uart_line_info (struct seq_file *m,struct uart_driver *drv,int i) {struct uart_state *state = drv->state + i;int pm_state;struct uart_port *port = state->port;char stat_buf[32 ];unsigned int status; -int mmio, ret; +int mmio;if (!port) -return 0 ; +return ; mmio = port->iotype >=UPIO_MEM ; - ret = sprintf(buf, "%d: uart:%s %s%08llX irq:%d", + seq_printf(m, "%d: uart:%s %s%08llX irq:%d", port->line, uart_type(port), mmio ? "mmio:0x" : "port:", mmio ? (unsigned long long)port->mapbase
@@ -1703,8 +1705,8 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i) port->irq);if (port->type ==PORT_UNKNOWN ) { -strcat (buf,"\n" ); -return ret +1 ; +seq_putc (m,'\n' ); +return ; }if (capable (CAP_SYS_ADMIN )) {
@@ -1719,19 +1721,19 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)uart_change_pm (state, pm_state);mutex_unlock (&state->mutex); - ret +=sprintf (buf + ret," tx:%d rx:%d" , +seq_printf (m," tx:%d rx:%d" , port->icount.tx, port->icount.rx);if (port->icount.frame) - ret +=sprintf (buf + ret," fe:%d" , +seq_printf (m," fe:%d" , port->icount.frame);if (port->icount.parity) - ret +=sprintf (buf + ret," pe:%d" , +seq_printf (m," pe:%d" , port->icount.parity);if (port->icount.brk) - ret +=sprintf (buf + ret," brk:%d" , +seq_printf (m," brk:%d" , port->icount.brk);if (port->icount.overrun) - ret +=sprintf (buf + ret," oe:%d" , +seq_printf (m," oe:%d" , port->icount.overrun);#define INFOBIT (bit, str) \
@@ -1753,45 +1755,39 @@ static int uart_line_info(char *buf, struct uart_driver *drv, int i)STATBIT (TIOCM_RNG ,"|RI" );if (stat_buf[0 ]) stat_buf[0 ] =' ' ; -strcat (stat_buf,"\n" ); - ret += sprintf(buf + ret, stat_buf); - }else { -strcat (buf,"\n" ); - ret++; + seq_puts(m, stat_buf); } +seq_putc (m,'\n' );#undef STATBIT#undef INFOBIT -return ret; } -static int uart_read_proc (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int uart_proc_show (struct seq_file *m,void *v) { -struct tty_driver *ttydrv = data; +struct tty_driver *ttydrv = v;struct uart_driver *drv = ttydrv->driver_state; -int i, len =0 , l; -off_t begin =0 ; +int i; - len +=sprintf (page,"serinfo:1.0 driver%s%s revision:%s\n" , +seq_printf (m,"serinfo:1.0 driver%s%s revision:%s\n" ,"" ,"" ,"" ); -for (i =0 ; i < drv->nr && len <PAGE_SIZE -96 ; i++) { - l =uart_line_info (page + len, drv, i); - len += l; -if (len + begin > off + count) - goto done; -if (len + begin < off) { - begin += len; - len =0 ; - } - } - *eof =1 ; - done: -if (off >= len + begin) -return 0 ; - *start = page + (off - begin); -return (count < begin + len - off) ? count : (begin + len - off); +for (i =0 ; i < drv->nr; i++) +uart_line_info (m, drv, i); +return 0 ; } + +static int uart_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, uart_proc_show,PDE (inode)->data); +} + +static const struct file_operations uart_proc_fops = { + .owner =THIS_MODULE , + .open = uart_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};#endif #if defined(CONFIG_SERIAL_CORE_CONSOLE ) || defined(CONFIG_CONSOLE_POLL )
@@ -2299,7 +2295,7 @@ static const struct tty_operations uart_ops = { .break_ctl = uart_break_ctl, .wait_until_sent= uart_wait_until_sent, #ifdef CONFIG_PROC_FS - .read_proc = uart_read_proc, + .proc_fops = &uart_proc_fops, #endif .tiocmget = uart_tiocmget, .tiocmset = uart_tiocmset,
Signature · 1 line
1.5.6.5
PATCH 12/17 proc tty: switch usb-serial to ->proc_fops
In reply to Alexey Dobriyan--- drivers/usb/serial/usb-serial.c | 58 ++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 31 deletions(-)
drivers/usb/serial/usb-serial.c +27 -31
@@ -26,6 +26,7 @@#include <linux/tty_flip.h> #include <linux/module.h> #include <linux/moduleparam.h> +#include <linux/seq_file.h> #include <linux/spinlock.h> #include <linux/mutex.h> #include <linux/list.h>
@@ -416,57 +417,52 @@ static int serial_break(struct tty_struct *tty, int break_state)return 0 ; } -static int serial_read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int serial_proc_show (struct seq_file *m,void *v) {struct usb_serial *serial; -int length =0 ;int i; -off_t begin =0 ;char tmp[40 ];dbg ("%s" , __func__); - length +=sprintf (page,"usbserinfo:1.0 driver:2.0\n" ); -for (i =0 ; i <SERIAL_TTY_MINORS && length <PAGE_SIZE ; ++i) { +seq_puts (m,"usbserinfo:1.0 driver:2.0\n" ); +for (i =0 ; i <SERIAL_TTY_MINORS ; ++i) { serial =usb_serial_get_by_index (i);if (serial ==NULL )continue ; - length +=sprintf (page+length,"%d:" , i); +seq_printf (m,"%d:" , i);if (serial->type->driver.owner) - length +=sprintf (page+length," module:%s" , +seq_printf (m," module:%s" ,module_name (serial->type->driver.owner)); - length +=sprintf (page+length," name:\"%s\"" , +seq_printf (m," name:\"%s\"" , serial->type->description); - length +=sprintf (page+length," vendor:%04x product:%04x" , +seq_printf (m," vendor:%04x product:%04x" ,le16_to_cpu (serial->dev->descriptor.idVendor),le16_to_cpu (serial->dev->descriptor.idProduct)); - length +=sprintf (page+length," num_ports:%d" , - serial->num_ports); - length +=sprintf (page+length," port:%d" , - i - serial->minor +1 ); +seq_printf (m," num_ports:%d" , serial->num_ports); +seq_printf (m," port:%d" , i - serial->minor +1 );usb_make_path (serial->dev, tmp,sizeof (tmp)); - length +=sprintf (page+length," path:%s" , tmp); +seq_printf (m," path:%s" , tmp); - length +=sprintf (page+length,"\n" ); -if ((length + begin) > (off + count)) { -usb_serial_put (serial); - goto done; - } -if ((length + begin) < off) { - begin += length; - length =0 ; - } +seq_putc (m,'\n' );usb_serial_put (serial); } - *eof =1 ; -done: -if (off >= (length + begin)) -return 0 ; - *start = page + (off-begin); -return (count < begin+length-off) ? count : begin+length-off; +return 0 ; } +static int serial_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, serial_proc_show,NULL ); +} + +static const struct file_operations serial_proc_fops = { + .owner =THIS_MODULE , + .open = serial_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +static int serial_tiocmget (struct tty_struct *tty,struct file *file) {struct usb_serial_port *port = tty->driver_data;
@@ -1101,9 +1097,9 @@ static const struct tty_operations serial_ops = { .unthrottle = serial_unthrottle, .break_ctl = serial_break, .chars_in_buffer = serial_chars_in_buffer, - .read_proc = serial_read_proc, .tiocmget = serial_tiocmget, .tiocmset = serial_tiocmset, + .proc_fops = &serial_proc_fops, };struct tty_driver *usb_serial_tty_driver;
Signature · 1 line
1.5.6.5
PATCH 13/17 proc tty: switch ircomm to ->proc_fops
In reply to Alexey Dobriyan--- net/irda/ircomm/ircomm_tty.c | 256 +++++++++++++++++++++++------------------- 1 files changed, 138 insertions(+), 118 deletions(-)
net/irda/ircomm/ircomm_tty.c +138 -118
@@ -34,6 +34,7 @@#include <linux/module.h> #include <linux/fs.h> #include <linux/sched.h> +#include <linux/seq_file.h> #include <linux/termios.h> #include <linux/tty.h> #include <linux/interrupt.h>
@@ -72,8 +73,7 @@ static int ircomm_tty_control_indication(void *instance, void *sap,static void ircomm_tty_flow_indication (void *instance,void *sap,LOCAL_FLOW cmd);#ifdef CONFIG_PROC_FS -static int ircomm_tty_read_proc (char *buf,char **start,off_t offset,int len, -int *eof,void *unused); +static const struct file_operations ircomm_tty_proc_fops;#endif /* CONFIG_PROC_FS */ static struct tty_driver *driver;
@@ -98,7 +98,7 @@ static const struct tty_operations ops = { .hangup = ircomm_tty_hangup, .wait_until_sent = ircomm_tty_wait_until_sent, #ifdef CONFIG_PROC_FS - .read_proc = ircomm_tty_read_proc, + .proc_fops = &ircomm_tty_proc_fops,#endif /* CONFIG_PROC_FS */ };
@@ -1245,150 +1245,170 @@ static void ircomm_tty_flow_indication(void *instance, void *sap, }#ifdef CONFIG_PROC_FS -static int ircomm_tty_line_info (struct ircomm_tty_cb *self,char *buf) +static void ircomm_tty_line_info (struct ircomm_tty_cb *self,struct seq_file *m) { -int ret=0 ; +char sep; - ret +=sprintf (buf+ret,"State: %s\n" , ircomm_tty_state[self->state]); +seq_printf (m,"State: %s\n" , ircomm_tty_state[self->state]); - ret +=sprintf (buf+ret,"Service type: " ); +seq_puts (m,"Service type: " );if (self->service_type &IRCOMM_9_WIRE ) - ret +=sprintf (buf+ret,"9_WIRE" ); +seq_puts (m,"9_WIRE" );else if (self->service_type &IRCOMM_3_WIRE ) - ret +=sprintf (buf+ret,"3_WIRE" ); +seq_puts (m,"3_WIRE" );else if (self->service_type &IRCOMM_3_WIRE_RAW ) - ret +=sprintf (buf+ret,"3_WIRE_RAW" ); +seq_puts (m,"3_WIRE_RAW" );else - ret +=sprintf (buf+ret,"No common service type!\n" ); - ret +=sprintf (buf+ret,"\n" ); - - ret +=sprintf (buf+ret,"Port name: %s\n" , self->settings.port_name); - - ret +=sprintf (buf+ret,"DTE status: " ); -if (self->settings.dte &IRCOMM_RTS ) - ret +=sprintf (buf+ret,"RTS|" ); -if (self->settings.dte &IRCOMM_DTR ) - ret +=sprintf (buf+ret,"DTR|" ); -if (self->settings.dte) - ret--;/* remove the last | */ - ret +=sprintf (buf+ret,"\n" ); - - ret +=sprintf (buf+ret,"DCE status: " ); -if (self->settings.dce &IRCOMM_CTS ) - ret +=sprintf (buf+ret,"CTS|" ); -if (self->settings.dce &IRCOMM_DSR ) - ret +=sprintf (buf+ret,"DSR|" ); -if (self->settings.dce &IRCOMM_CD ) - ret +=sprintf (buf+ret,"CD|" ); -if (self->settings.dce &IRCOMM_RI ) - ret +=sprintf (buf+ret,"RI|" ); -if (self->settings.dce) - ret--;/* remove the last | */ - ret +=sprintf (buf+ret,"\n" ); - - ret +=sprintf (buf+ret,"Configuration: " ); +seq_puts (m,"No common service type!\n" ); +seq_putc (m,'\n' ); + +seq_printf (m,"Port name: %s\n" , self->settings.port_name); + +seq_printf (m,"DTE status:" ); + sep =' ' ; +if (self->settings.dte &IRCOMM_RTS ) { +seq_printf (m,"%cRTS" , sep); + sep ='|' ; + } +if (self->settings.dte &IRCOMM_DTR ) { +seq_printf (m,"%cDTR" , sep); + sep ='|' ; + } +seq_putc (m,'\n' ); + +seq_puts (m,"DCE status:" ); + sep =' ' ; +if (self->settings.dce &IRCOMM_CTS ) { +seq_printf (m,"%cCTS" , sep); + sep ='|' ; + } +if (self->settings.dce &IRCOMM_DSR ) { +seq_printf (m,"%cDSR" , sep); + sep ='|' ; + } +if (self->settings.dce &IRCOMM_CD ) { +seq_printf (m,"%cCD" , sep); + sep ='|' ; + } +if (self->settings.dce &IRCOMM_RI ) { +seq_printf (m,"%cRI" , sep); + sep ='|' ; + } +seq_putc (m,'\n' ); + +seq_puts (m,"Configuration: " );if (!self->settings.null_modem) - ret +=sprintf (buf+ret,"DTE <-> DCE\n" ); +seq_puts (m,"DTE <-> DCE\n" );else - ret +=sprintf (buf+ret, -"DTE <-> DTE (null modem emulation)\n" ); - - ret +=sprintf (buf+ret,"Data rate: %d\n" , self->settings.data_rate); - - ret +=sprintf (buf+ret,"Flow control: " ); -if (self->settings.flow_control &IRCOMM_XON_XOFF_IN ) - ret +=sprintf (buf+ret,"XON_XOFF_IN|" ); -if (self->settings.flow_control &IRCOMM_XON_XOFF_OUT ) - ret +=sprintf (buf+ret,"XON_XOFF_OUT|" ); -if (self->settings.flow_control &IRCOMM_RTS_CTS_IN ) - ret +=sprintf (buf+ret,"RTS_CTS_IN|" ); -if (self->settings.flow_control &IRCOMM_RTS_CTS_OUT ) - ret +=sprintf (buf+ret,"RTS_CTS_OUT|" ); -if (self->settings.flow_control &IRCOMM_DSR_DTR_IN ) - ret +=sprintf (buf+ret,"DSR_DTR_IN|" ); -if (self->settings.flow_control &IRCOMM_DSR_DTR_OUT ) - ret +=sprintf (buf+ret,"DSR_DTR_OUT|" ); -if (self->settings.flow_control &IRCOMM_ENQ_ACK_IN ) - ret +=sprintf (buf+ret,"ENQ_ACK_IN|" ); -if (self->settings.flow_control &IRCOMM_ENQ_ACK_OUT ) - ret +=sprintf (buf+ret,"ENQ_ACK_OUT|" ); -if (self->settings.flow_control) - ret--;/* remove the last | */ - ret +=sprintf (buf+ret,"\n" ); - - ret +=sprintf (buf+ret,"Flags: " ); -if (self->flags &ASYNC_CTS_FLOW ) - ret +=sprintf (buf+ret,"ASYNC_CTS_FLOW|" ); -if (self->flags &ASYNC_CHECK_CD ) - ret +=sprintf (buf+ret,"ASYNC_CHECK_CD|" ); -if (self->flags &ASYNC_INITIALIZED ) - ret +=sprintf (buf+ret,"ASYNC_INITIALIZED|" ); -if (self->flags &ASYNC_LOW_LATENCY ) - ret +=sprintf (buf+ret,"ASYNC_LOW_LATENCY|" ); -if (self->flags &ASYNC_CLOSING ) - ret +=sprintf (buf+ret,"ASYNC_CLOSING|" ); -if (self->flags &ASYNC_NORMAL_ACTIVE ) - ret +=sprintf (buf+ret,"ASYNC_NORMAL_ACTIVE|" ); -if (self->flags) - ret--;/* remove the last | */ - ret +=sprintf (buf+ret,"\n" ); - - ret +=sprintf (buf+ret,"Role: %s\n" , self->client ? -"client" :"server" ); - ret +=sprintf (buf+ret,"Open count: %d\n" , self->open_count); - ret +=sprintf (buf+ret,"Max data size: %d\n" , self->max_data_size); - ret +=sprintf (buf+ret,"Max header size: %d\n" , self->max_header_size); +seq_puts (m,"DTE <-> DTE (null modem emulation)\n" ); + +seq_printf (m,"Data rate: %d\n" , self->settings.data_rate); + +seq_puts (m,"Flow control:" ); + sep =' ' ; +if (self->settings.flow_control &IRCOMM_XON_XOFF_IN ) { +seq_printf (m,"%cXON_XOFF_IN" , sep); + sep ='|' ; + } +if (self->settings.flow_control &IRCOMM_XON_XOFF_OUT ) { +seq_printf (m,"%cXON_XOFF_OUT" , sep); + sep ='|' ; + } +if (self->settings.flow_control &IRCOMM_RTS_CTS_IN ) { +seq_printf (m,"%cRTS_CTS_IN" , sep); + sep ='|' ; + } +if (self->settings.flow_control &IRCOMM_RTS_CTS_OUT ) { +seq_printf (m,"%cRTS_CTS_OUT" , sep); + sep ='|' ; + } +if (self->settings.flow_control &IRCOMM_DSR_DTR_IN ) { +seq_printf (m,"%cDSR_DTR_IN" , sep); + sep ='|' ; + } +if (self->settings.flow_control &IRCOMM_DSR_DTR_OUT ) { +seq_printf (m,"%cDSR_DTR_OUT" , sep); + sep ='|' ; + } +if (self->settings.flow_control &IRCOMM_ENQ_ACK_IN ) { +seq_printf (m,"%cENQ_ACK_IN" , sep); + sep ='|' ; + } +if (self->settings.flow_control &IRCOMM_ENQ_ACK_OUT ) { +seq_printf (m,"%cENQ_ACK_OUT" , sep); + sep ='|' ; + } +seq_putc (m,'\n' ); + +seq_puts (m,"Flags:" ); + sep =' ' ; +if (self->flags &ASYNC_CTS_FLOW ) { +seq_printf (m,"%cASYNC_CTS_FLOW" , sep); + sep ='|' ; + } +if (self->flags &ASYNC_CHECK_CD ) { +seq_printf (m,"%cASYNC_CHECK_CD" , sep); + sep ='|' ; + } +if (self->flags &ASYNC_INITIALIZED ) { +seq_printf (m,"%cASYNC_INITIALIZED" , sep); + sep ='|' ; + } +if (self->flags &ASYNC_LOW_LATENCY ) { +seq_printf (m,"%cASYNC_LOW_LATENCY" , sep); + sep ='|' ; + } +if (self->flags &ASYNC_CLOSING ) { +seq_printf (m,"%cASYNC_CLOSING" , sep); + sep ='|' ; + } +if (self->flags &ASYNC_NORMAL_ACTIVE ) { +seq_printf (m,"%cASYNC_NORMAL_ACTIVE" , sep); + sep ='|' ; + } +seq_putc (m,'\n' ); + +seq_printf (m,"Role: %s\n" , self->client ?"client" :"server" ); +seq_printf (m,"Open count: %d\n" , self->open_count); +seq_printf (m,"Max data size: %d\n" , self->max_data_size); +seq_printf (m,"Max header size: %d\n" , self->max_header_size);if (self->tty) - ret +=sprintf (buf+ret,"Hardware: %s\n" , +seq_printf (m,"Hardware: %s\n" , self->tty->hw_stopped ?"Stopped" :"Running" ); - - ret +=sprintf (buf+ret,"\n" ); -return ret; } - -/* -* Function ircomm_tty_read_proc (buf, start, offset, len, eof, unused) -* -* -* -*/ -static int ircomm_tty_read_proc (char *buf,char **start,off_t offset,int len, -int *eof,void *unused) +static int ircomm_tty_proc_show (struct seq_file *m,void *v) {struct ircomm_tty_cb *self; -int count =0 , l; -off_t begin =0 ;unsigned long flags;spin_lock_irqsave (&ircomm_tty->hb_spinlock, flags); self = (struct ircomm_tty_cb *)hashbin_get_first (ircomm_tty); -while ((self !=NULL ) && (count <4000 )) { +while (self !=NULL ) {if (self->magic !=IRCOMM_TTY_MAGIC )break ; - l =ircomm_tty_line_info (self, buf + count); - count += l; -if (count+begin > offset+len) - goto done; -if (count+begin < offset) { - begin += count; - count =0 ; - } - +ircomm_tty_line_info (self, m); self = (struct ircomm_tty_cb *)hashbin_get_next (ircomm_tty); } - *eof =1 ; -done:spin_unlock_irqrestore (&ircomm_tty->hb_spinlock, flags); +return 0 ; +} -if (offset >= count+begin) -return 0 ; - *start = buf + (offset-begin); -return ((len < begin+count-offset) ? len : begin+count-offset); +static int ircomm_tty_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, ircomm_tty_proc_show,NULL ); } + +static const struct file_operations ircomm_tty_proc_fops = { + .owner =THIS_MODULE , + .open = ircomm_tty_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};#endif /* CONFIG_PROC_FS */ MODULE_AUTHOR ("Dag Brattli <[email protected]>" );
Signature · 1 line
1.5.6.5
PATCH 14/17 proc tty: switch amiserial to ->proc_fops
In reply to Alexey Dobriyan--- drivers/char/amiserial.c | 62 ++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 34 deletions(-)
drivers/char/amiserial.c +28 -34
@@ -79,6 +79,7 @@ static char *serial_version = "4.30";#include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/mm.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/init.h> #include <linux/bitops.h>
@@ -1825,14 +1826,13 @@ static int rs_open(struct tty_struct *tty, struct file * filp)* /proc fs routines.... */ -static inline int line_info (char *buf,struct serial_state *state) +static inline void line_info (struct seq_file *m,struct serial_state *state) {struct async_struct *info = state->info, scr_info;char stat_buf[30 ], control, status; -int ret;unsigned long flags; - ret =sprintf (buf,"%d: uart:amiga_builtin" ,state->line); +seq_printf (m,"%d: uart:amiga_builtin" ,state->line);/* * Figure out the current RS-232 lines
@@ -1864,55 +1864,49 @@ static inline int line_info(char *buf, struct serial_state *state)strcat (stat_buf,"|CD" );if (info->quot) { - ret +=sprintf (buf+ret," baud:%d" , - state->baud_base / info->quot); +seq_printf (m," baud:%d" , state->baud_base / info->quot); } - ret +=sprintf (buf+ret," tx:%d rx:%d" , - state->icount.tx, state->icount.rx); +seq_printf (m," tx:%d rx:%d" , state->icount.tx, state->icount.rx);if (state->icount.frame) - ret +=sprintf (buf+ret," fe:%d" , state->icount.frame); +seq_printf (m," fe:%d" , state->icount.frame);if (state->icount.parity) - ret +=sprintf (buf+ret," pe:%d" , state->icount.parity); +seq_printf (m," pe:%d" , state->icount.parity);if (state->icount.brk) - ret +=sprintf (buf+ret," brk:%d" , state->icount.brk); +seq_printf (m," brk:%d" , state->icount.brk);if (state->icount.overrun) - ret +=sprintf (buf+ret," oe:%d" , state->icount.overrun); +seq_printf (m," oe:%d" , state->icount.overrun);/* * Last thing is the RS-232 status lines */ - ret +=sprintf (buf+ret," %s\n" , stat_buf+1 ); -return ret; +seq_printf (m," %s\n" , stat_buf+1 ); } -static int rs_read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int rs_proc_show (struct seq_file *m,void *v) { -int len =0 , l; -off_t begin =0 ; - - len +=sprintf (page,"serinfo:1.0 driver:%s\n" , serial_version); - l =line_info (page + len, &rs_table[0 ]); - len += l; -if (len+begin > off+count) - goto done; -if (len+begin < off) { - begin += len; - len =0 ; - } - *eof =1 ; -done: -if (off >= len+begin) -return 0 ; - *start = page + (off-begin); -return ((count < begin+len-off) ? count : begin+len-off); +seq_printf (m,"serinfo:1.0 driver:%s\n" , serial_version); +line_info (m, &rs_table[0 ]); +return 0 ; } +static int rs_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, rs_proc_show,NULL ); +} + +static const struct file_operations rs_proc_fops = { + .owner =THIS_MODULE , + .open = rs_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/* * --------------------------------------------------------------------- * rs_init() and friends
@@ -1951,9 +1945,9 @@ static const struct tty_operations serial_ops = { .break_ctl = rs_break, .send_xchar = rs_send_xchar, .wait_until_sent = rs_wait_until_sent, - .read_proc = rs_read_proc, .tiocmget = rs_tiocmget, .tiocmset = rs_tiocmset, + .proc_fops = &rs_proc_fops, };/*
Signature · 1 line
1.5.6.5
PATCH 15/17 proc tty: switch ia64 simserial to ->proc_fops
In reply to Alexey Dobriyan--- arch/ia64/hp/sim/simserial.c | 49 ++++++++++++++++++++--------------------- 1 files changed, 24 insertions(+), 25 deletions(-)
arch/ia64/hp/sim/simserial.c +24 -25
@@ -24,6 +24,7 @@#include <linux/major.h> #include <linux/fcntl.h> #include <linux/mm.h> +#include <linux/seq_file.h> #include <linux/slab.h> #include <linux/capability.h> #include <linux/console.h>
@@ -848,38 +849,36 @@ static int rs_open(struct tty_struct *tty, struct file * filp)* /proc fs routines.... */ -static inline int line_info (char *buf,struct serial_state *state) +static inline void line_info (struct seq_file *m,struct serial_state *state) { -return sprintf (buf,"%d: uart:%s port:%lX irq:%d\n" , +seq_printf (m,"%d: uart:%s port:%lX irq:%d\n" , state->line, uart_config[state->type].name, state->port, state->irq); } -static int rs_read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int rs_proc_show (struct seq_file *m,void *v) { -int i, len =0 , l; -off_t begin =0 ; - - len +=sprintf (page,"simserinfo:1.0 driver:%s\n" , serial_version); -for (i =0 ; i <NR_PORTS && len <4000 ; i++) { - l =line_info (page + len, &rs_table[i]); - len += l; -if (len+begin > off+count) - goto done; -if (len+begin < off) { - begin += len; - len =0 ; - } - } - *eof =1 ; -done: -if (off >= len+begin) -return 0 ; - *start = page + (begin-off); -return ((count < begin+len-off) ? count : begin+len-off); +int i; + +seq_printf (m,"simserinfo:1.0 driver:%s\n" , serial_version); +for (i =0 ; i <NR_PORTS ; i++) +line_info (m, &rs_table[i]); +return 0 ; } +static int rs_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, rs_proc_show,NULL ); +} + +static const struct file_operations rs_proc_fops = { + .owner =THIS_MODULE , + .open = rs_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/* * --------------------------------------------------------------------- * rs_init() and friends
@@ -917,7 +916,7 @@ static const struct tty_operations hp_ops = { .start = rs_start, .hangup = rs_hangup, .wait_until_sent = rs_wait_until_sent, - .read_proc = rs_read_proc, + .proc_fops = &rs_proc_fops, };/*
Signature · 1 line
1.5.6.5
PATCH 16/17 proc tty: switch xtensa iss console to ->proc_fops
In reply to Alexey Dobriyan--- arch/xtensa/platforms/iss/console.c | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-)
arch/xtensa/platforms/iss/console.c +16 -13
@@ -18,6 +18,7 @@#include <linux/mm.h> #include <linux/major.h> #include <linux/param.h> +#include <linux/seq_file.h> #include <linux/serial.h> #include <linux/serialP.h>
@@ -178,22 +179,24 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout)/* Stub, once again.. */ } -static int rs_read_proc (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int rs_proc_show (struct seq_file *m,void *v) { -int len =0 ; -off_t begin =0 ; - - len +=sprintf (page,"serinfo:1.0 driver:%s\n" , serial_version); - *eof =1 ; - -if (off >= len + begin) -return 0 ; +seq_printf (m,"serinfo:1.0 driver:%s\n" , serial_version); +return 0 ; +} - *start = page + (off - begin); -return ((count < begin + len - off) ? count : begin + len - off); +static int rs_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, rs_proc_show,NULL ); } +static const struct file_operations rs_proc_fops = { + .owner =THIS_MODULE , + .open = rs_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +};static struct tty_operations serial_ops = { .open = rs_open,
@@ -205,7 +208,7 @@ static struct tty_operations serial_ops = { .chars_in_buffer = rs_chars_in_buffer, .hangup = rs_hangup, .wait_until_sent = rs_wait_until_sent, - .read_proc = rs_read_proc + .proc_fops = &rs_proc_fops, };int __init rs_init (void )
Signature · 1 line
1.5.6.5
PATCH 17/17 proc tty: remove struct tty_operations::read_proc
In reply to Alexey Dobriyanstruct tty_operations::proc_fops took it's place and there is one less create_proc_read_entry() user now!
--- drivers/isdn/capi/capi.c | 7 ------- fs/proc/proc_tty.c | 21 ++++++--------------- include/linux/tty_driver.h | 2 -- net/bluetooth/rfcomm/tty.c | 6 ------ 4 files changed, 6 insertions(+), 30 deletions(-)
drivers/isdn/capi/capi.c +0 -7
@@ -1331,12 +1331,6 @@ static void capinc_tty_send_xchar(struct tty_struct *tty, char ch)#endif } -static int capinc_tty_read_proc (char *page,char **start,off_t off, -int count,int *eof,void *data) -{ -return 0 ; -} -static struct tty_driver *capinc_tty_driver;static const struct tty_operations capinc_ops = {
@@ -1358,7 +1352,6 @@ static const struct tty_operations capinc_ops = { .flush_buffer = capinc_tty_flush_buffer, .set_ldisc = capinc_tty_set_ldisc, .send_xchar = capinc_tty_send_xchar, - .read_proc = capinc_tty_read_proc, };static int capinc_tty_init (void )
fs/proc/proc_tty.c +6 -15
@@ -144,23 +144,14 @@ void proc_tty_register_driver(struct tty_driver *driver) {struct proc_dir_entry *ent; -if (!driver->driver_name || driver->proc_entry) +if (!driver->driver_name || driver->proc_entry || + !driver->ops->proc_fops)return ; -if (driver->ops->proc_fops) { - ent =proc_create_data (driver->driver_name,0 , proc_tty_driver, - driver->ops->proc_fops, driver); -if (!ent) -return ; - }else if (driver->ops->read_proc) { - ent =create_proc_entry (driver->driver_name,0 , proc_tty_driver); -if (!ent) -return ; - ent->read_proc = driver->ops->read_proc; - ent->data = driver; - }else -return ; - ent->owner = driver->owner; + ent =proc_create_data (driver->driver_name,0 , proc_tty_driver, + driver->ops->proc_fops, driver); +if (ent) + ent->owner = driver->owner; driver->proc_entry = ent; }
include/linux/tty_driver.h +0 -2
@@ -252,8 +252,6 @@ struct tty_operations {void (*set_ldisc)(struct tty_struct *tty);void (*wait_until_sent)(struct tty_struct *tty,int timeout);void (*send_xchar)(struct tty_struct *tty,char ch); -int (*read_proc)(char *page,char **start,off_t off, -int count,int *eof,void *data);int (*tiocmget)(struct tty_struct *tty,struct file *file);int (*tiocmset)(struct tty_struct *tty,struct file *file,unsigned int set,unsigned int clear);
net/bluetooth/rfcomm/tty.c +0 -6
@@ -1092,11 +1092,6 @@ static void rfcomm_tty_hangup(struct tty_struct *tty) } } -static int rfcomm_tty_read_proc (char *buf,char **start,off_t offset,int len,int *eof,void *unused) -{ -return 0 ; -} -static int rfcomm_tty_tiocmget (struct tty_struct *tty,struct file *filp) {struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
@@ -1155,7 +1150,6 @@ static const struct tty_operations rfcomm_ops = { .send_xchar = rfcomm_tty_send_xchar, .hangup = rfcomm_tty_hangup, .wait_until_sent = rfcomm_tty_wait_until_sent, - .read_proc = rfcomm_tty_read_proc, .tiocmget = rfcomm_tty_tiocmget, .tiocmset = rfcomm_tty_tiocmset, };
Signature · 1 line
1.5.6.5