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

n_hdlc: convert debuglevel use to pr_debug 



With pr_debug we have a fine-grained control about debugging prints. So
convert the use of global debuglevel variable and tests to a commonly
used pr_debug. And drop debuglevel completely.

This also implicitly adds a loglevel to the messages (KERN_DEBUG) as it
was missing on most of them.

And also use __func__ instead of function names explicitly typed.

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


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

drivers/tty/n_hdlc.c

+31 −48
Original line number Diff line number Diff line
@@ -160,10 +160,6 @@ static struct n_hdlc_buf *n_hdlc_buf_get(struct n_hdlc_buf_list *list); 


static struct n_hdlc *n_hdlc_alloc (void);



/* debug level can be set by insmod for debugging purposes */

#define DEBUG_LEVEL_INFO	1

static int debuglevel;



/* max frame size for memory allocations */

static int maxframe = 4096;
@@ -310,10 +306,8 @@ static int n_hdlc_tty_open (struct tty_struct *tty) 
{

	struct n_hdlc *n_hdlc = tty2n_hdlc (tty);



	if (debuglevel >= DEBUG_LEVEL_INFO)	

		printk("%s(%d)n_hdlc_tty_open() called (device=%s)\n",

		__FILE__,__LINE__,

		tty->name);

	pr_debug("%s(%d)%s() called (device=%s)\n",

			__FILE__, __LINE__, __func__, tty->name);



	/* There should not be an existing table for this slot. */

	if (n_hdlc) {
@@ -372,8 +366,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty) 


	tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);

	while (tbuf) {

		if (debuglevel >= DEBUG_LEVEL_INFO)	

			printk("%s(%d)sending frame %p, count=%d\n",

		pr_debug("%s(%d)sending frame %p, count=%d\n",

				__FILE__, __LINE__, tbuf, tbuf->count);



		/* Send the next block of data to device */
@@ -391,8 +384,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty) 
			actual = tbuf->count;

		

		if (actual == tbuf->count) {

			if (debuglevel >= DEBUG_LEVEL_INFO)	

				printk("%s(%d)frame %p completed\n",

			pr_debug("%s(%d)frame %p completed\n",

					__FILE__, __LINE__, tbuf);



			/* free current transmit buffer */
@@ -404,8 +396,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty) 
			/* get next pending transmit buffer */

			tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);

		} else {

			if (debuglevel >= DEBUG_LEVEL_INFO)	

				printk("%s(%d)frame %p pending\n",

			pr_debug("%s(%d)frame %p pending\n",

					__FILE__, __LINE__, tbuf);



			/*
@@ -467,9 +458,8 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data, 
	register struct n_hdlc *n_hdlc = tty2n_hdlc (tty);

	register struct n_hdlc_buf *buf;



	if (debuglevel >= DEBUG_LEVEL_INFO)	

		printk("%s(%d)n_hdlc_tty_receive() called count=%d\n",

			__FILE__,__LINE__, count);

	pr_debug("%s(%d)%s() called count=%d\n",

			__FILE__, __LINE__, __func__, count);



	/* This can happen if stuff comes in on the backup tty */

	if (!n_hdlc || tty != n_hdlc->tty)
@@ -483,8 +473,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data, 
	}

	

	if ( count>maxframe ) {

		if (debuglevel >= DEBUG_LEVEL_INFO)	

			printk("%s(%d) rx count>maxframesize, data discarded\n",

		pr_debug("%s(%d) rx count>maxframesize, data discarded\n",

				__FILE__, __LINE__);

		return;

	}
@@ -500,8 +489,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data, 
	}

	

	if (!buf) {

		if (debuglevel >= DEBUG_LEVEL_INFO)	

			printk("%s(%d) no more rx buffers, data discarded\n",

		pr_debug("%s(%d) no more rx buffers, data discarded\n",

				__FILE__, __LINE__);

		return;

	}
@@ -619,9 +607,8 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file, 
	DECLARE_WAITQUEUE(wait, current);

	struct n_hdlc_buf *tbuf;



	if (debuglevel >= DEBUG_LEVEL_INFO)	

		printk("%s(%d)n_hdlc_tty_write() called count=%zd\n",

			__FILE__,__LINE__,count);

	pr_debug("%s(%d)%s() called count=%zd\n", __FILE__, __LINE__, __func__,

			count);



	/* Verify pointers */

	if (!n_hdlc)
@@ -632,11 +619,8 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file, 


	/* verify frame size */

	if (count > maxframe ) {

		if (debuglevel & DEBUG_LEVEL_INFO)

			printk (KERN_WARNING

				"n_hdlc_tty_write: truncating user packet "

				"from %lu to %d\n", (unsigned long) count,

				maxframe );

		pr_debug("%s: truncating user packet from %zu to %d\n",

				__func__, count, maxframe);

		count = maxframe;

	}
@@ -704,9 +688,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file, 
	unsigned long flags;

	struct n_hdlc_buf *buf = NULL;



	if (debuglevel >= DEBUG_LEVEL_INFO)	

		printk("%s(%d)n_hdlc_tty_ioctl() called %d\n",

			__FILE__,__LINE__,cmd);

	pr_debug("%s(%d)%s() called %d\n", __FILE__, __LINE__, __func__, cmd);



	/* Verify the status of the device */

	if (!n_hdlc || n_hdlc->magic != HDLC_MAGIC)
@@ -822,8 +804,9 @@ static struct n_hdlc *n_hdlc_alloc(void) 
		buf = kmalloc(struct_size(buf, buf, maxframe), GFP_KERNEL);

		if (buf)

			n_hdlc_buf_put(&n_hdlc->rx_free_buf_list,buf);

		else if (debuglevel >= DEBUG_LEVEL_INFO)	

			printk("%s(%d)n_hdlc_alloc(), kalloc() failed for rx buffer %d\n",__FILE__,__LINE__, i);

		else

			pr_debug("%s(%d)%s(), kmalloc() failed for rx buffer %d\n",

					__FILE__, __LINE__, __func__, i);

	}

	

	/* allocate free tx buffer list */
@@ -831,8 +814,9 @@ static struct n_hdlc *n_hdlc_alloc(void) 
		buf = kmalloc(struct_size(buf, buf, maxframe), GFP_KERNEL);

		if (buf)

			n_hdlc_buf_put(&n_hdlc->tx_free_buf_list,buf);

		else if (debuglevel >= DEBUG_LEVEL_INFO)	

			printk("%s(%d)n_hdlc_alloc(), kalloc() failed for tx buffer %d\n",__FILE__,__LINE__, i);

		else

			pr_debug("%s(%d)%s(), kmalloc() failed for tx buffer %d\n",

					__FILE__, __LINE__, __func__, i);

	}

	

	/* Initialize the control block */
@@ -960,6 +944,5 @@ module_exit(n_hdlc_exit); 


MODULE_LICENSE("GPL");

MODULE_AUTHOR("Paul Fulghum paulkf@microgate.com");

module_param(debuglevel, int, 0);

module_param(maxframe, int, 0);

MODULE_ALIAS_LDISC(N_HDLC);

CRA Git | Maintained and supported by SUSTech CRA and CCSE