iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

n_hdlc: remove useless whitespace at line wraps

Browse Source 
Do
  s@[ \t]\+$@@
  s@ \+\t@\t@
on the file as there are many spaces at the begininning of lines and
many spaces/tabs at EOLs. And vim screamed.

git show -w is supposed to show no difference here.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200219084118.26491-20-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2020-02-19 09:41:14 +01:00 committed by Greg Kroah-Hartman
parent d86b05cb0e
commit 43741e9bc0
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/tty/n_hdlc.c
View File

@ -18,7 +18,7 @@
* All HDLC data is frame oriented which means: * All HDLC data is frame oriented which means:
* *
* 1. tty write calls represent one complete transmit frame of data * 1. tty write calls represent one complete transmit frame of data
* The device driver should accept the complete frame or none of * The device driver should accept the complete frame or none of
* the frame (busy) in the write method. Each write call should have * the frame (busy) in the write method. Each write call should have
* a byte count in the range of 2-65535 bytes (2 is min HDLC frame * a byte count in the range of 2-65535 bytes (2 is min HDLC frame
* with 1 addr byte and 1 ctrl byte). The max byte count of 65535 * with 1 addr byte and 1 ctrl byte). The max byte count of 65535
@ -39,7 +39,7 @@
* tty read calls. * tty read calls.
* *
* 3. tty read calls returns an entire frame of data or nothing. * 3. tty read calls returns an entire frame of data or nothing.
* *
* 4. all send and receive data is considered raw. No processing * 4. all send and receive data is considered raw. No processing
* or translation is performed by the line discipline, regardless * or translation is performed by the line discipline, regardless
* of the tty flags * of the tty flags
@ -104,7 +104,7 @@
/* /*
* Buffers for individual HDLC frames * Buffers for individual HDLC frames
*/ */
#define MAX_HDLC_FRAME_SIZE 65535 #define MAX_HDLC_FRAME_SIZE 65535
#define DEFAULT_RX_BUF_COUNT 10 #define DEFAULT_RX_BUF_COUNT 10
#define MAX_RX_BUF_COUNT 60 #define MAX_RX_BUF_COUNT 60
#define DEFAULT_TX_BUF_COUNT 3 #define DEFAULT_TX_BUF_COUNT 3
@ -234,24 +234,24 @@ static int n_hdlc_tty_open (struct tty_struct *tty)
pr_err("%s: tty already associated!\n", __func__); pr_err("%s: tty already associated!\n", __func__);
return -EEXIST; return -EEXIST;
} }
n_hdlc = n_hdlc_alloc(); n_hdlc = n_hdlc_alloc();
if (!n_hdlc) { if (!n_hdlc) {
pr_err("%s: n_hdlc_alloc failed\n", __func__); pr_err("%s: n_hdlc_alloc failed\n", __func__);
return -ENFILE; return -ENFILE;
} }
tty->disc_data = n_hdlc; tty->disc_data = n_hdlc;
tty->receive_room = 65536; tty->receive_room = 65536;
/* change tty_io write() to not split large writes into 8K chunks */ /* change tty_io write() to not split large writes into 8K chunks */
set_bit(TTY_NO_WRITE_SPLIT,&tty->flags); set_bit(TTY_NO_WRITE_SPLIT,&tty->flags);
/* flush receive data from driver */ /* flush receive data from driver */
tty_driver_flush_buffer(tty); tty_driver_flush_buffer(tty);
return 0; return 0;
} /* end of n_tty_hdlc_open() */ } /* end of n_tty_hdlc_open() */
/** /**
@ -269,9 +269,9 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
unsigned long flags; unsigned long flags;
struct n_hdlc_buf *tbuf; struct n_hdlc_buf *tbuf;
check_again: check_again:
spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags); spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
if (n_hdlc->tbusy) { if (n_hdlc->tbusy) {
n_hdlc->woke_up = true; n_hdlc->woke_up = true;
spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags); spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
@ -299,7 +299,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
/* pretending it was accepted by driver */ /* pretending it was accepted by driver */
if (actual < 0) if (actual < 0)
actual = tbuf->count; actual = tbuf->count;
if (actual == tbuf->count) { if (actual == tbuf->count) {
pr_debug("%s(%d)frame %p completed\n", pr_debug("%s(%d)frame %p completed\n",
__FILE__, __LINE__, tbuf); __FILE__, __LINE__, tbuf);
@ -309,7 +309,7 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
/* wait up sleeping writers */ /* wait up sleeping writers */
wake_up_interruptible(&tty->write_wait); wake_up_interruptible(&tty->write_wait);
/* get next pending transmit buffer */ /* get next pending transmit buffer */
tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list); tbuf = n_hdlc_buf_get(&n_hdlc->tx_buf_list);
} else { } else {
@ -324,17 +324,17 @@ static void n_hdlc_send_frames(struct n_hdlc *n_hdlc, struct tty_struct *tty)
break; break;
} }
} }
if (!tbuf) if (!tbuf)
clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
/* Clear the re-entry flag */ /* Clear the re-entry flag */
spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags); spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock, flags);
n_hdlc->tbusy = false; n_hdlc->tbusy = false;
spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags); spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock, flags);
if (n_hdlc->woke_up) if (n_hdlc->woke_up)
goto check_again; goto check_again;
} /* end of n_hdlc_send_frames() */ } /* end of n_hdlc_send_frames() */
/** /**
@ -375,14 +375,14 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
__FILE__, __LINE__); __FILE__, __LINE__);
return; return;
} }
if ( count>maxframe ) { if ( count>maxframe ) {
pr_debug("%s(%d) rx count>maxframesize, data discarded\n", pr_debug("%s(%d) rx count>maxframesize, data discarded\n",
__FILE__, __LINE__); __FILE__, __LINE__);
return; return;
} }
/* get a free HDLC buffer */ /* get a free HDLC buffer */
buf = n_hdlc_buf_get(&n_hdlc->rx_free_buf_list); buf = n_hdlc_buf_get(&n_hdlc->rx_free_buf_list);
if (!buf) { if (!buf) {
/* no buffers in free list, attempt to allocate another rx buffer */ /* no buffers in free list, attempt to allocate another rx buffer */
@ -391,20 +391,20 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
buf = kmalloc(struct_size(buf, buf, maxframe), buf = kmalloc(struct_size(buf, buf, maxframe),
GFP_ATOMIC); GFP_ATOMIC);
} }
if (!buf) { if (!buf) {
pr_debug("%s(%d) no more rx buffers, data discarded\n", pr_debug("%s(%d) no more rx buffers, data discarded\n",
__FILE__, __LINE__); __FILE__, __LINE__);
return; return;
} }
/* copy received data to HDLC buffer */ /* copy received data to HDLC buffer */
memcpy(buf->buf,data,count); memcpy(buf->buf,data,count);
buf->count=count; buf->count=count;
/* add HDLC buffer to list of received frames */ /* add HDLC buffer to list of received frames */
n_hdlc_buf_put(&n_hdlc->rx_buf_list, buf); n_hdlc_buf_put(&n_hdlc->rx_buf_list, buf);
/* wake up any blocked reads and perform async signalling */ /* wake up any blocked reads and perform async signalling */
wake_up_interruptible (&tty->read_wait); wake_up_interruptible (&tty->read_wait);
if (tty->fasync != NULL) if (tty->fasync != NULL)
@ -418,7 +418,7 @@ static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
* @file - pointer to open file object * @file - pointer to open file object
* @buf - pointer to returned data buffer * @buf - pointer to returned data buffer
* @nr - size of returned data buffer * @nr - size of returned data buffer
* *
* Returns the number of bytes returned or error code. * Returns the number of bytes returned or error code.
*/ */
static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file, static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
@ -468,7 +468,7 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
n_hdlc_buf_put(&n_hdlc->rx_free_buf_list, rbuf); n_hdlc_buf_put(&n_hdlc->rx_free_buf_list, rbuf);
break; break;
} }
/* no data */ /* no data */
if (tty_io_nonblock(tty, file)) { if (tty_io_nonblock(tty, file)) {
ret = -EAGAIN; ret = -EAGAIN;
@ -487,7 +487,7 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
return ret; return ret;
} /* end of n_hdlc_tty_read() */ } /* end of n_hdlc_tty_read() */
/** /**
@ -496,7 +496,7 @@ static ssize_t n_hdlc_tty_read(struct tty_struct *tty, struct file *file,
* @file - pointer to file object data * @file - pointer to file object data
* @data - pointer to transmit data (one frame) * @data - pointer to transmit data (one frame)
* @count - size of transmit frame in bytes * @count - size of transmit frame in bytes
* *
* Returns the number of bytes written (or error code). * Returns the number of bytes written (or error code).
*/ */
static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file, static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
@ -519,12 +519,12 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
__func__, count, maxframe); __func__, count, maxframe);
count = maxframe; count = maxframe;
} }
add_wait_queue(&tty->write_wait, &wait); add_wait_queue(&tty->write_wait, &wait);
for (;;) { for (;;) {
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list); tbuf = n_hdlc_buf_get(&n_hdlc->tx_free_buf_list);
if (tbuf) if (tbuf)
break; break;
@ -544,7 +544,7 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);
remove_wait_queue(&tty->write_wait, &wait); remove_wait_queue(&tty->write_wait, &wait);
if (!error) { if (!error) {
/* Retrieve the user's buffer */ /* Retrieve the user's buffer */
memcpy(tbuf->buf, data, count); memcpy(tbuf->buf, data, count);
@ -555,7 +555,7 @@ static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
} }
return error; return error;
} /* end of n_hdlc_tty_write() */ } /* end of n_hdlc_tty_write() */
/** /**
@ -623,7 +623,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
break; break;
} }
return error; return error;
} /* end of n_hdlc_tty_ioctl() */ } /* end of n_hdlc_tty_ioctl() */
/** /**
@ -631,7 +631,7 @@ static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
* @tty - pointer to tty instance data * @tty - pointer to tty instance data
* @filp - pointer to open file object for device * @filp - pointer to open file object for device
* @poll_table - wait queue for operations * @poll_table - wait queue for operations
* *
* Determine which operations (read/write) will not block and return info * Determine which operations (read/write) will not block and return info
* to caller. * to caller.
* Returns a bit mask containing info on which ops will not block. * Returns a bit mask containing info on which ops will not block.
@ -712,7 +712,7 @@ static struct n_hdlc *n_hdlc_alloc(void)
n_hdlc->magic = HDLC_MAGIC; n_hdlc->magic = HDLC_MAGIC;
return n_hdlc; return n_hdlc;
} /* end of n_hdlc_alloc() */ } /* end of n_hdlc_alloc() */
/** /**
@ -754,7 +754,7 @@ static void n_hdlc_buf_put(struct n_hdlc_buf_list *buf_list,
/** /**
* n_hdlc_buf_get - remove and return an HDLC buffer from list * n_hdlc_buf_get - remove and return an HDLC buffer from list
* @buf_list - pointer to HDLC buffer list * @buf_list - pointer to HDLC buffer list
* *
* Remove and return an HDLC buffer from the head of the specified HDLC buffer * Remove and return an HDLC buffer from the head of the specified HDLC buffer
* list. * list.
* Returns a pointer to HDLC buffer if available, otherwise %NULL. * Returns a pointer to HDLC buffer if available, otherwise %NULL.
@ -808,7 +808,7 @@ static int __init n_hdlc_init(void)
status); status);
return status; return status;
} /* end of init_module() */ } /* end of init_module() */
static void __exit n_hdlc_exit(void) static void __exit n_hdlc_exit(void)