Commit edee649f authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

n_hdlc: move tty_ldisc_ops to the bottom 



This makes forward declarations unnecessary. So drop them.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200219084118.26491-16-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 740708ab

drivers/tty/n_hdlc.c

+15 −31
Original line number Diff line number Diff line
@@ -157,22 +157,6 @@ static struct n_hdlc *n_hdlc_alloc (void); 
/* max frame size for memory allocations */

static int maxframe = 4096;



/* TTY callbacks */



static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,

			   __u8 __user *buf, size_t nr);

static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,

			    const unsigned char *buf, size_t nr);

static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,

			    unsigned int cmd, unsigned long arg);

static __poll_t n_hdlc_tty_poll(struct tty_struct *tty, struct file *filp,

				    poll_table *wait);

static int n_hdlc_tty_open(struct tty_struct *tty);

static void n_hdlc_tty_close(struct tty_struct *tty);

static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *cp,

			       char *fp, int count);

static void n_hdlc_tty_wakeup(struct tty_struct *tty);



static void flush_rx_queue(struct tty_struct *tty)

{

	struct n_hdlc *n_hdlc = tty->disc_data;
@@ -191,21 +175,6 @@ static void flush_tx_queue(struct tty_struct *tty) 
		n_hdlc_buf_put(&n_hdlc->tx_free_buf_list, buf);

}



static struct tty_ldisc_ops n_hdlc_ldisc = {

	.owner		= THIS_MODULE,

	.magic		= TTY_LDISC_MAGIC,

	.name		= "hdlc",

	.open		= n_hdlc_tty_open,

	.close		= n_hdlc_tty_close,

	.read		= n_hdlc_tty_read,

	.write		= n_hdlc_tty_write,

	.ioctl		= n_hdlc_tty_ioctl,

	.poll		= n_hdlc_tty_poll,

	.receive_buf	= n_hdlc_tty_receive,

	.write_wakeup	= n_hdlc_tty_wakeup,

	.flush_buffer   = flush_rx_queue,

};



static void n_hdlc_free_buf_list(struct n_hdlc_buf_list *list)

{

	struct n_hdlc_buf *buf;
@@ -810,6 +779,21 @@ static struct n_hdlc_buf *n_hdlc_buf_get(struct n_hdlc_buf_list *buf_list) 
	return buf;

}	/* end of n_hdlc_buf_get() */



static struct tty_ldisc_ops n_hdlc_ldisc = {

	.owner		= THIS_MODULE,

	.magic		= TTY_LDISC_MAGIC,

	.name		= "hdlc",

	.open		= n_hdlc_tty_open,

	.close		= n_hdlc_tty_close,

	.read		= n_hdlc_tty_read,

	.write		= n_hdlc_tty_write,

	.ioctl		= n_hdlc_tty_ioctl,

	.poll		= n_hdlc_tty_poll,

	.receive_buf	= n_hdlc_tty_receive,

	.write_wakeup	= n_hdlc_tty_wakeup,

	.flush_buffer   = flush_rx_queue,

};



static int __init n_hdlc_init(void)

{

	int status;