projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2bfb2b7
)
n_hdlc: add missing spaces after commas
author
Jiri Slaby
<jslaby@suse.cz>
Wed, 19 Feb 2020 08:41:16 +0000
(09:41 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 21 Feb 2020 09:24:34 +0000
(10:24 +0100)
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link:
https://lore.kernel.org/r/20200219084118.26491-22-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/n_hdlc.c
patch
|
blob
|
history
diff --git
a/drivers/tty/n_hdlc.c
b/drivers/tty/n_hdlc.c
index
d52bcfa
..
7ae4347
100644
(file)
--- a/
drivers/tty/n_hdlc.c
+++ b/
drivers/tty/n_hdlc.c
@@
-201,7
+201,7
@@
static void n_hdlc_tty_close(struct tty_struct *tty)
return;
}
#if defined(TTY_NO_WRITE_SPLIT)
return;
}
#if defined(TTY_NO_WRITE_SPLIT)
- clear_bit(TTY_NO_WRITE_SPLIT,&tty->flags);
+ clear_bit(TTY_NO_WRITE_SPLIT,
&tty->flags);
#endif
tty->disc_data = NULL;
#endif
tty->disc_data = NULL;
@@
-245,7
+245,7
@@
static int n_hdlc_tty_open(struct tty_struct *tty)
tty->receive_room = 65536;
/* change tty_io write() to not split large writes into 8K chunks */
tty->receive_room = 65536;
/* 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 */
tty_driver_flush_buffer(tty);
/* flush receive data from driver */
tty_driver_flush_buffer(tty);
@@
-399,7
+399,7
@@
static void n_hdlc_tty_receive(struct tty_struct *tty, const __u8 *data,
}
/* 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;
/* add HDLC buffer to list of received frames */
buf->count=count;
/* add HDLC buffer to list of received frames */
@@
-550,8
+550,8
@@
static ssize_t n_hdlc_tty_write(struct tty_struct *tty, struct file *file,
/* Send the data */
tbuf->count = error = count;
/* Send the data */
tbuf->count = error = count;
- n_hdlc_buf_put(&n_hdlc->tx_buf_list,tbuf);
- n_hdlc_send_frames(n_hdlc,tty);
+ n_hdlc_buf_put(&n_hdlc->tx_buf_list,
tbuf);
+ n_hdlc_send_frames(n_hdlc,
tty);
}
return error;
}
return error;
@@
-586,14
+586,14
@@
static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
case FIONREAD:
/* report count of read data available */
/* in next available frame (if any) */
case FIONREAD:
/* report count of read data available */
/* in next available frame (if any) */
- spin_lock_irqsave(&n_hdlc->rx_buf_list.spinlock,flags);
+ spin_lock_irqsave(&n_hdlc->rx_buf_list.spinlock,
flags);
buf = list_first_entry_or_null(&n_hdlc->rx_buf_list.list,
struct n_hdlc_buf, list_item);
if (buf)
count = buf->count;
else
count = 0;
buf = list_first_entry_or_null(&n_hdlc->rx_buf_list.list,
struct n_hdlc_buf, list_item);
if (buf)
count = buf->count;
else
count = 0;
- spin_unlock_irqrestore(&n_hdlc->rx_buf_list.spinlock,flags);
+ spin_unlock_irqrestore(&n_hdlc->rx_buf_list.spinlock,
flags);
error = put_user(count, (int __user *)arg);
break;
error = put_user(count, (int __user *)arg);
break;
@@
-601,12
+601,12
@@
static int n_hdlc_tty_ioctl(struct tty_struct *tty, struct file *file,
/* get the pending tx byte count in the driver */
count = tty_chars_in_buffer(tty);
/* add size of next output frame in queue */
/* get the pending tx byte count in the driver */
count = tty_chars_in_buffer(tty);
/* add size of next output frame in queue */
- spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock,flags);
+ spin_lock_irqsave(&n_hdlc->tx_buf_list.spinlock,
flags);
buf = list_first_entry_or_null(&n_hdlc->tx_buf_list.list,
struct n_hdlc_buf, list_item);
if (buf)
count += buf->count;
buf = list_first_entry_or_null(&n_hdlc->tx_buf_list.list,
struct n_hdlc_buf, list_item);
if (buf)
count += buf->count;
- spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock,flags);
+ spin_unlock_irqrestore(&n_hdlc->tx_buf_list.spinlock,
flags);
error = put_user(count, (int __user *)arg);
break;
error = put_user(count, (int __user *)arg);
break;