Commit 4e8d8878 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

tty: core: the rest to u8 



There are still last minor users in the tty core that still reference
characters by the 'char' type. Switch them to u8.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20231206073712.17776-6-jirislaby@kernel.org


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

drivers/tty/tty_io.c

+5 −5
Original line number Diff line number Diff line
@@ -852,9 +852,9 @@ static ssize_t iterate_tty_read(struct tty_ldisc *ld, struct tty_struct *tty, 
{

	void *cookie = NULL;

	unsigned long offset = 0;

	char kernel_buf[64];

	ssize_t retval = 0;

	size_t copied, count = iov_iter_count(to);

	u8 kernel_buf[64];



	do {

		ssize_t size = min(count, sizeof(kernel_buf));
@@ -995,7 +995,7 @@ static ssize_t iterate_tty_write(struct tty_ldisc *ld, struct tty_struct *tty, 


	/* write_buf/write_cnt is protected by the atomic_write_lock mutex */

	if (tty->write_cnt < chunk) {

		unsigned char *buf_chunk;

		u8 *buf_chunk;



		if (chunk < 1024)

			chunk = 1024;
@@ -2278,10 +2278,10 @@ static bool tty_legacy_tiocsti __read_mostly = IS_ENABLED(CONFIG_LEGACY_TIOCSTI) 
 *  * Called functions take tty_ldiscs_lock

 *  * current->signal->tty check is safe without locks

 */

static int tiocsti(struct tty_struct *tty, char __user *p)

static int tiocsti(struct tty_struct *tty, u8 __user *p)

{

	char ch;

	struct tty_ldisc *ld;

	u8 ch;



	if (!tty_legacy_tiocsti && !capable(CAP_SYS_ADMIN))

		return -EIO;
@@ -3142,7 +3142,7 @@ struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx) 
 *

 * Return: the number of characters successfully output.

 */

int tty_put_char(struct tty_struct *tty, unsigned char ch)

int tty_put_char(struct tty_struct *tty, u8 ch)

{

	if (tty->ops->put_char)

		return tty->ops->put_char(tty, ch);

include/linux/tty.h

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ struct tty_struct { 
	void *driver_data;

	spinlock_t files_lock;

	int write_cnt;

	unsigned char *write_buf;

	u8 *write_buf;



	struct list_head tty_files;
@@ -411,7 +411,7 @@ void stop_tty(struct tty_struct *tty); 
void start_tty(struct tty_struct *tty);

void tty_write_message(struct tty_struct *tty, char *msg);

int tty_send_xchar(struct tty_struct *tty, u8 ch);

int tty_put_char(struct tty_struct *tty, unsigned char c);

int tty_put_char(struct tty_struct *tty, u8 c);

unsigned int tty_chars_in_buffer(struct tty_struct *tty);

unsigned int tty_write_room(struct tty_struct *tty);

void tty_driver_flush_buffer(struct tty_struct *tty);