Commit e6c8dd8a authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

proc tty: switch synclinkmp to ->proc_fops 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a18c56e5

drivers/char/synclinkmp.c

+34 −40
Original line number Diff line number Diff line
@@ -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;

	}



	*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)
@@ -3905,13 +3899,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,

};