[permalink] [raw]

Subject: [PATCH 11/27] tty: goldfish: convert to u8 and size_t

Switch character types to u8 and sizes to size_t. To conform to
characters/sizes in the rest of the tty layer.

Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
---
drivers/tty/goldfish.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c
index 7ad7fa66cb27..d27979eabfdf 100644
--- a/drivers/tty/goldfish.c
+++ b/drivers/tty/goldfish.c
@@ -50,10 +50,8 @@ static u32 goldfish_tty_line_count = 8;
static u32 goldfish_tty_current_line_count;
static struct goldfish_tty *goldfish_ttys;

-static void do_rw_io(struct goldfish_tty *qtty,
- unsigned long address,
- unsigned int count,
- bool is_write)
+static void do_rw_io(struct goldfish_tty *qtty, unsigned long address,
+ size_t count, bool is_write)
{
unsigned long irq_flags;
void __iomem *base = qtty->base;
@@ -73,10 +71,8 @@ static void do_rw_io(struct goldfish_tty *qtty,
spin_unlock_irqrestore(&qtty->lock, irq_flags);
}

-static void goldfish_tty_rw(struct goldfish_tty *qtty,
- unsigned long addr,
- unsigned int count,
- bool is_write)
+static void goldfish_tty_rw(struct goldfish_tty *qtty, unsigned long addr,
+ size_t count, bool is_write)
{
dma_addr_t dma_handle;
enum dma_data_direction dma_dir;
@@ -125,7 +121,7 @@ static void goldfish_tty_rw(struct goldfish_tty *qtty,
}
}

-static void goldfish_tty_do_write(int line, const u8 *buf, unsigned int count)
+static void goldfish_tty_do_write(int line, const u8 *buf, size_t count)
{
struct goldfish_tty *qtty = &goldfish_ttys[line];

@@ -136,7 +132,7 @@ static irqreturn_t goldfish_tty_interrupt(int irq, void *dev_id)
{
struct goldfish_tty *qtty = dev_id;
void __iomem *base = qtty->base;
- unsigned char *buf;
+ u8 *buf;
u32 count;

count = gf_ioread32(base + GOLDFISH_TTY_REG_BYTES_READY);
--
2.43.0

2023-12-06 07:39:34

by Jiri Slaby

[permalink] [raw]

Subject: [PATCH 16/27] tty: mmc: sdio: use u8 for flag

Switch character types to u8. To conform to characters in the rest of
the tty layer.

Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
Cc: Ulf Hansson <[email protected]>
Cc: [email protected]
---
drivers/mmc/core/sdio_uart.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/mmc/core/sdio_uart.c b/drivers/mmc/core/sdio_uart.c
index 370fadf1d6d1..575ebbce378e 100644
--- a/drivers/mmc/core/sdio_uart.c
+++ b/drivers/mmc/core/sdio_uart.c
@@ -354,12 +354,11 @@ static void sdio_uart_stop_rx(struct sdio_uart_port *port)

static void sdio_uart_receive_chars(struct sdio_uart_port *port, u8 *status)
{
- unsigned int flag;
int max_count = 256;

do {
u8 ch = sdio_in(port, UART_RX);
- flag = TTY_NORMAL;
+ u8 flag = TTY_NORMAL;
port->icount.rx++;

if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE |
--
2.43.0

2023-12-06 07:39:36

by Jiri Slaby

[permalink] [raw]

Subject: [PATCH 15/27] tty: mips_ejtag_fdc: use u8 for character pointers

mips_ejtag_fdc_encode() and mips_ejtag_fdc_put_chan() declare arrays of
pointers to characters. Switch their types from char to u8 to conform
to the current tty layer types for characters.

Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
---
drivers/tty/mips_ejtag_fdc.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/tty/mips_ejtag_fdc.c b/drivers/tty/mips_ejtag_fdc.c
index 369ec71c24ef..aac80b69a069 100644
--- a/drivers/tty/mips_ejtag_fdc.c
+++ b/drivers/tty/mips_ejtag_fdc.c
@@ -213,16 +213,16 @@ struct fdc_word {
*/

/* ranges >= 1 && sizes[0] >= 1 */
-static struct fdc_word mips_ejtag_fdc_encode(const char **ptrs,
+static struct fdc_word mips_ejtag_fdc_encode(const u8 **ptrs,
unsigned int *sizes,
unsigned int ranges)
{
struct fdc_word word = { 0, 0 };
- const char **ptrs_end = ptrs + ranges;
+ const u8 **ptrs_end = ptrs + ranges;

for (; ptrs < ptrs_end; ++ptrs) {
- const char *ptr = *(ptrs++);
- const char *end = ptr + *(sizes++);
+ const u8 *ptr = *(ptrs++);
+ const u8 *end = ptr + *(sizes++);

for (; ptr < end; ++ptr) {
word.word |= (u8)*ptr << (8*word.bytes);
@@ -417,7 +417,7 @@ static unsigned int mips_ejtag_fdc_put_chan(struct mips_ejtag_fdc_tty *priv,
{
struct mips_ejtag_fdc_tty_port *dport;
struct tty_struct *tty;
- const char *ptrs[2];
+ const u8 *ptrs[2];
unsigned int sizes[2] = { 0 };
struct fdc_word word = { .bytes = 0 };
unsigned long flags;
--
2.43.0

2023-12-06 07:39:45

by Jiri Slaby

[permalink] [raw]

Subject: [PATCH 17/27] tty: moxa: convert to u8 and size_t

Switch character types to u8 and sizes to size_t. To conform to
characters/sizes in the rest of the tty layer.

Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
---
drivers/tty/moxa.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index bf3f87ba3a92..ebaada8db929 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -514,7 +514,7 @@ static void MoxaPortLineCtrl(struct moxa_port *, bool, bool);
static void MoxaPortFlowCtrl(struct moxa_port *, int, int, int, int, int);
static int MoxaPortLineStatus(struct moxa_port *);
static void MoxaPortFlushData(struct moxa_port *, int);
-static int MoxaPortWriteData(struct tty_struct *, const unsigned char *, int);
+static ssize_t MoxaPortWriteData(struct tty_struct *, const u8 *, size_t);
static int MoxaPortReadData(struct moxa_port *);
static unsigned int MoxaPortTxQueue(struct moxa_port *);
static int MoxaPortRxQueue(struct moxa_port *);
@@ -1933,10 +1933,10 @@ static void MoxaPortFlushData(struct moxa_port *port, int mode)
*
* Function 20: Write data.
* Syntax:
- * int MoxaPortWriteData(int port, unsigned char * buffer, int length);
+ * ssize_t MoxaPortWriteData(int port, u8 *buffer, size_t length);
* int port : port number (0 - 127)
- * unsigned char * buffer : pointer to write data buffer.
- * int length : write data length
+ * u8 *buffer : pointer to write data buffer.
+ * size_t length : write data length
*
* return: 0 - length : real write data length
*
@@ -2163,11 +2163,12 @@ static int MoxaPortLineStatus(struct moxa_port *port)
return val;
}

-static int MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer, int len)
+static ssize_t MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer,
+ size_t len)
{
struct moxa_port *port = tty->driver_data;
void __iomem *baseAddr, *ofsAddr, *ofs;
- unsigned int c, total;
+ size_t c, total;
u16 head, tail, tx_mask, spage, epage;
u16 pageno, pageofs, bufhead;

@@ -2224,8 +2225,8 @@ static int MoxaPortWriteData(struct tty_struct *tty, const u8 *buffer, int len)
static int MoxaPortReadData(struct moxa_port *port)
{
struct tty_struct *tty = port->port.tty;
- unsigned char *dst;
void __iomem *baseAddr, *ofsAddr, *ofs;
+ u8 *dst;
unsigned int count, len, total;
u16 tail, rx_mask, spage, epage;
u16 pageno, pageofs, bufhead, head;
--
2.43.0

2023-12-06 07:39:53

by Jiri Slaby

[permalink] [raw]

On Wed, Dec 06, 2023 at 08:36:54AM +0100, Jiri Slaby (SUSE) wrote:
> Switch character types to u8 and sizes to size_t. To conform to
> characters/sizes in the rest of the tty layer.
>
> Signed-off-by: Jiri Slaby (SUSE) <[email protected]>
> Cc: Heiko Carstens <[email protected]>
> Cc: Vasily Gorbik <[email protected]>
> Cc: Alexander Gordeev <[email protected]>
> Cc: Christian Borntraeger <[email protected]>
> Cc: Sven Schnelle <[email protected]>
> Cc: [email protected]
> ---
> drivers/s390/char/con3270.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
> index 363315fa1666..251d2a1c3eef 100644
> --- a/drivers/s390/char/con3270.c
> +++ b/drivers/s390/char/con3270.c
> @@ -54,7 +54,7 @@ struct tty3270_attribute {
> };
>
> struct tty3270_cell {
> - unsigned char character;
> + u8 character;
> struct tty3270_attribute attributes;
> };
>
> @@ -123,7 +123,7 @@ struct tty3270 {
>
> /* Character array for put_char/flush_chars. */
> unsigned int char_count;
> - char char_buf[TTY3270_CHAR_BUF_SIZE];
> + u8 char_buf[TTY3270_CHAR_BUF_SIZE];
> };
>
> /* tty3270->update_flags. See tty3270_update for details. */
> @@ -1255,7 +1255,7 @@ static unsigned int tty3270_write_room(struct tty_struct *tty)
> * Insert character into the screen at the current position with the
> * current color and highlight. This function does NOT do cursor movement.
> */
> -static void tty3270_put_character(struct tty3270 *tp, char ch)
> +static void tty3270_put_character(struct tty3270 *tp, u8 ch)
> {
> struct tty3270_line *line;
> struct tty3270_cell *cell;
> @@ -1561,7 +1561,7 @@ static void tty3270_goto_xy(struct tty3270 *tp, int cx, int cy)
> * Pn is a numeric parameter, a string of zero or more decimal digits.
> * Ps is a selective parameter.
> */
> -static void tty3270_escape_sequence(struct tty3270 *tp, char ch)
> +static void tty3270_escape_sequence(struct tty3270 *tp, u8 ch)
> {
> enum { ES_NORMAL, ES_ESC, ES_SQUARE, ES_PAREN, ES_GETPARS };
>
> @@ -1726,7 +1726,7 @@ static void tty3270_escape_sequence(struct tty3270 *tp, char ch)
> * String write routine for 3270 ttys
> */
> static void tty3270_do_write(struct tty3270 *tp, struct tty_struct *tty,
> - const unsigned char *buf, int count)
> + const u8 *buf, size_t count)
> {
> int i_msg, i;
>
> @@ -2052,7 +2052,7 @@ con3270_write(struct console *co, const char *str, unsigned int count)
> {
> struct tty3270 *tp = co->data;
> unsigned long flags;
> - char c;
> + u8 c;
>
> spin_lock_irqsave(&tp->view.lock, flags);
> while (count--) {

Acked-by: Alexander Gordeev <[email protected]>